From c70431fb0d115669b2fe8ee52765f7861e543a93 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 1 Dec 2010 14:26:27 +0100
Subject: [PATCH] correct subject

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 eth/user/isg_sans_lab_install | 3 +--
 eth/user/isg_win7_install     | 2 +-
 figlet_alle_fonts             | 4 +++-
 get-sysinfo.sh                | 3 +++
 lh                            | 2 +-
 x-monitors.sh                 | 1 +
 x20x-sync                     | 8 +++++---
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/eth/user/isg_sans_lab_install b/eth/user/isg_sans_lab_install
index 408d942..8d26e5b 100755
--- a/eth/user/isg_sans_lab_install
+++ b/eth/user/isg_sans_lab_install
@@ -40,7 +40,7 @@ $__myname: <number> [carbon copy recipients]
 
    Requires NETHZ_USERNAME to be set.
 
-   Example: NETHZ_USERNAME="nicosc" $__myname 30 user1 user2
+   Example: NETHZ_USERNAME="nicosc" $__myname 30 user1 nethz2
 
 eof
    exit 1
@@ -60,7 +60,6 @@ done
 
 sendmail="/usr/sbin/sendmail"
 from="${NETHZ_USERNAME}@ethz.ch"
-to="nicosc@ethz.ch"
 
 cat << eof | $sendmail -f "$from" $to
 To: $headerto
diff --git a/eth/user/isg_win7_install b/eth/user/isg_win7_install
index cc69c4f..44b75d9 100755
--- a/eth/user/isg_win7_install
+++ b/eth/user/isg_win7_install
@@ -58,7 +58,7 @@ from="${NETHZ_USERNAME}@ethz.ch"
 
 cat << eof | $sendmail -f "$from" $to
 To: $headerto
-Subject: Reinstallation of $machine
+Subject: Installation request for Host $machine
 
 Dear support@inf.ethz.ch,
 
diff --git a/figlet_alle_fonts b/figlet_alle_fonts
index 525fb9a..9a96ef0 100755
--- a/figlet_alle_fonts
+++ b/figlet_alle_fonts
@@ -6,4 +6,6 @@ set -e
 
 #cd /usr/figle*/share/figlet/
 cd /usr/share/figlet
-for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo hallo | figlet -f $BLA; done
+cd /usr/share/figlet/fonts/
+#for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo hallo | figlet -f $BLA; done
+for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo CM Bofs | figlet -f $BLA; done
diff --git a/get-sysinfo.sh b/get-sysinfo.sh
index 32fcdea..db7fafd 100755
--- a/get-sysinfo.sh
+++ b/get-sysinfo.sh
@@ -38,6 +38,9 @@ dest="${0##*/}.${host}.log"
    # hw in total
    lshw
 
+   # information from dmidecode may differ
+   dmidecode
+
    # ram
    free
 
diff --git a/lh b/lh
index 980d78e..42c6b73 100755
--- a/lh
+++ b/lh
@@ -2,4 +2,4 @@
 file=$(date +%Y-%m-%d)
 
 set -x
-$EDITOR "${file}"
+$EDITOR "$1${file}"
diff --git a/x-monitors.sh b/x-monitors.sh
index aa56fd0..2d3bea3 100755
--- a/x-monitors.sh
+++ b/x-monitors.sh
@@ -46,6 +46,7 @@ while [ "${i}" -lt 2 ]; do
       posfile="${HOME}/${prefix}${position}"
       if [ -f "${posfile}" ]; then
          while read output; do
+            xrandr --output "${output}" --off
             xrandr --output "${output}" --${position} "${main}" --auto
          done < "${posfile}"
       fi
diff --git a/x20x-sync b/x20x-sync
index 86cd9eb..b088876 100755
--- a/x20x-sync
+++ b/x20x-sync
@@ -1,13 +1,15 @@
 #!/bin/sh
 
+dir="/home/"
+
 case $(hostname) in
    kr)
-      other="ikn.ethz.ch"
+      other="root@ikn.ethz.ch"
    ;;
 
    ikn)
-      other="kr.ethz.ch"
+      other="root@kr.ethz.ch"
    ;;
 esac
 
-rsync -av --delete --exclude .electricsheep ~/ $other:
+sudo rsync -av --delete-before --delete $dir $other:$dir