diff options
| author | Simon Rettberg | 2013-12-19 16:14:36 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-19 16:14:36 +0100 |
| commit | 97f9fd9ceaf72950b03f20aede8622f469494b55 (patch) | |
| tree | 9610b09188c12096a5dee42801cdb7152456a912 | |
| parent | [systemd] Add patch that doesn't clear HOME and USER environment variable to ... (diff) | |
| parent | [kernel] added 'veth' to list of required kernel modules (diff) | |
| download | tm-scripts-97f9fd9ceaf72950b03f20aede8622f469494b55.tar.gz tm-scripts-97f9fd9ceaf72950b03f20aede8622f469494b55.tar.xz tm-scripts-97f9fd9ceaf72950b03f20aede8622f469494b55.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 1 | ||||
| -rw-r--r-- | server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf | 4 | ||||
| -rwxr-xr-x | useful/lddcopy | 23 | ||||
| -rwxr-xr-x | useful/lddsize | 26 |
4 files changed, 53 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index f9d0ebae..6b23646e 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -130,6 +130,7 @@ REQUIRED_KERNEL_MODULES=" kernel/sound kernel/fs/autofs4/autofs4 kernel/drivers/net/macvtap.ko + kernel/drivers/net/veth.ko " REQUIRED_FIRMWARE=" 3com diff --git a/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf index 52fc0033..f9a1b926 100644 --- a/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf +++ b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf @@ -1,2 +1,4 @@ [SpecificSettings] -132.230.4.100=1280x800 +132.230.4.140=1280x800 +132.230.4.156=1280x800 +132.230.4.120=1280x800 diff --git a/useful/lddcopy b/useful/lddcopy new file mode 100755 index 00000000..c8f5ceb6 --- /dev/null +++ b/useful/lddcopy @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ $# -ne 2 ]; then + echo "Usage: $0 FILE TARGET_HOST" >&2 + exit 1 +fi + +# libfreetype.so.6 => /usr/lib/x86_64-linux-gnu/libfreetype.so.6 (0x00007f0844776000) +if [ -e "$1" ]; then + FILE="$1" +else + FILE=$(which "$1") +fi + +if [ ! -e "$FILE" ]; then + echo "FILE NOT FOUND: $FILE" >&2 + exit 1 +fi + +SOS=$(ldd "$FILE" | sed -r 's/^[^=]*=> ([^ ]*) .*$/\1*/g' | grep '^/') +set -x +tar -cpP $FILE $SOS | ssh "root@$2" "tar -xp -C /" + diff --git a/useful/lddsize b/useful/lddsize new file mode 100755 index 00000000..1215f989 --- /dev/null +++ b/useful/lddsize @@ -0,0 +1,26 @@ +#!/bin/bash + +# libfreetype.so.6 => /usr/lib/x86_64-linux-gnu/libfreetype.so.6 (0x00007f0844776000) +if [ -e "$1" ]; then + FILE="$1" +else + FILE=$(which "$1") +fi + +if [ ! -e "$FILE" ]; then + echo "FILE NOT FOUND: $FILE" >&2 + exit 1 +fi + +SOS=$(ldd "$FILE" | sed -r 's/^[^=]*=> ([^ ]*) .*$/\1/g' | grep '^/') +SIZE=$(stat -c %s "$FILE") +LIBS=0 +for SO in $SOS; do + S=$(stat -c %s "$SO") + SIZE=$(( $SIZE + $S )) + LIBS=$(( $LIBS + 1 )) +done + +SIZE=$(( $SIZE / 1024 )) +echo "$FILE has $LIBS shared libs with a total size of ${SIZE}KiB (including itself)" + |