mass update commit

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>

eth/user/isg_sans_lab_install

@@ -83,7 +83,7 @@ Name:            Nico Schottelius
 NumScreens:      1
 OU:              Sans-lab
 Office:          cab/e/79
-Other Info:      Wie alle anderen sans-lab Maschinen
+Other Info:      Wie alle anderen sans-lab Maschinen, Siehe #112231, #112228, #111140
 Phone:           27609
 Resolution:      1920x1200
 Root:            ISG

eth/user/isg_win7_install

@@ -34,9 +34,9 @@ if [ -z "$NETHZ_USERNAME" ]; then
    exit 1
 fi
 
-if [ $# -ne 3 ]; then
+if [ $# -lt 3 ]; then
    cat << eof
-$__myname: <machine> <ou> <room>
+$__myname: <machine> <ou> <room> [comments]
 
    Requires NETHZ_USERNAME to be set.
 
@@ -49,6 +49,7 @@ fi
 machine="$1"; shift
 ou="$1"; shift
 room="$1"; shift
+comment="$@"
 
 headerto="support@inf.ethz.ch"
 to="support@inf.ethz.ch $from"
@@ -75,7 +76,7 @@ Name:            Nico Schottelius
 NumScreens:      1
 OU:              $ou
 Office:          cab/e/79
-Other Info:      
+Other Info:      $comment
 Phone:           27609
 Resolution:      1920x1200
 Root:            ISG

figlet_alle_fonts

@@ -8,4 +8,5 @@ set -e
 cd /usr/share/figlet
 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
+#for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo CM Bofs | figlet -f $BLA; done
+for a in *.flf; do BLA=${a%.flf}; echo $BLA ; echo $BLA | figlet -f $BLA; done

hole_mails

@@ -9,7 +9,7 @@ fi
 
 while true; do
    fetchmail >/dev/null
-#   offlineimap
+   offlineimap
    echo "Mails abgeholt, schlafe nun $SLEEP Sekunde(n)"
    sleep $SLEEP;
 done

lh

@@ -1,5 +1,9 @@
 #!/bin/sh
-file=$(date +%Y-%m-%d)
+
+suffix="$1"
+datef="$2"
+
+file=$(date +%Y-%m-%d $datef)
 
 set -x
-$EDITOR "$1${file}"
+$EDITOR "${file}${suffix}"

linux/install.sh

@@ -22,7 +22,7 @@ set -e
 #version="$(git describe)
 version=$(cat include/config/kernel.release)
 ddir="/boot"
-spath="arch/x86_64/boot/bzImage"
+spath="arch/x86/boot/bzImage"
 fname="vmlinuz-$version"
 fpath="${ddir}/${fname}"
 gpath="$ddir/grub/menu.lst"

mytime

@@ -7,3 +7,6 @@ LENGTH=$((END-START))
 LENGTHM=$((LENGTH/60))
 
 echo "Run: ${LENGTH}s ($LENGTHM minutes)"
+
+# Record values
+echo "$@; ${LENGTH}" >> ~/.mytime

release_tmp

@@ -10,6 +10,6 @@ url="http://home.schottelius.org/~nico/temp"
 bfile="$(basename "$file")"
 
 scp "$file" "${host}:$dir"
-ssh $host "chmod a+r $dir/$bfile"
+ssh $host "chmod a+r \"$dir/$bfile\""
 
 echo "Pre-released ${url}/${bfile}"

x-autostart

@@ -5,7 +5,7 @@ tmutt
 tmutt
 
 # start tee window
-x-terminal-emulator -name tee -e ressh.sh tee.schottelius.org
+# x-terminal-emulator -name tee -e ressh.sh tee.schottelius.org
 
 # start root window
 x-terminal-emulator -name sudo -e sudo -i

x-links

@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output HDMI1 --auto --rotate normal --right-of LVDS1
+xrandr --output HDMI1 --auto --rotate normal --left-of LVDS1

x20x-sync

@@ -10,6 +10,13 @@ case $(hostname) in
    ikn)
       other="root@kr.ethz.ch"
    ;;
+   *)
+      echo "I am confused, where I am?"
+      exit 1
+   ;;
 esac
 
-sudo rsync -av --delete-before --delete $dir $other:$dir
+sudo rsync -av \
+   --exclude /home/services/eth-usbhd  \
+   --exclude /home/services/usbhd      \
+   --delete-before --delete $dir $other:$dir