diff --git a/buch_start.sh b/buch_start.sh index 75287c6..d1a3fa5 100755 --- a/buch_start.sh +++ b/buch_start.sh @@ -1,14 +1,16 @@ +dev1="/dev/sd$1"; shift +dev2="/dev/sd$1"; shift +dev3="/dev/sd$1"; shift + #devs='/dev/sde /dev/sdf /dev/sdg' devs="/dev/sde /dev/sdc /dev/sdd" -devs="/dev/sdb /dev/sdc /dev/sdd" -devs="/dev/sdc /dev/sdb" set -e set -x -mdadm --assemble /dev/md0 $devs +mdadm --assemble /dev/md0 $dev1 $dev2 $dev3 cryptsetup luksOpen /dev/md0 raid fsck /dev/mapper/raid -mount /home/server/raid +mount /home/services/raid exit 0 diff --git a/eth/ikn-backup.sh b/eth/ikn-backup.sh index 4cf1b0b..411c575 100755 --- a/eth/ikn-backup.sh +++ b/eth/ikn-backup.sh @@ -1,7 +1,7 @@ #!/bin/sh -e -ccollect=/home/user/nico/p/ccollect/ccollect/ccollect.sh +ccollect=/home/users/nico/lp/ccollect/ccollect/ccollect.sh # in pre_exec #cryptsetup luksOpen /dev/sdc usbhd diff --git a/eth/lan-up.sh b/eth/lan-up.sh index a1ea0fe..7199a96 100755 --- a/eth/lan-up.sh +++ b/eth/lan-up.sh @@ -5,3 +5,4 @@ wpa_cli terminate killall vpnc ip l s wlan0 down ip l s eth0 up +udhcpc -nfqi eth0 diff --git a/eth/wlan-vpn.sh b/eth/wlan-vpn.sh index 9b6ffcf..11cbe4d 100755 --- a/eth/wlan-vpn.sh +++ b/eth/wlan-vpn.sh @@ -16,9 +16,9 @@ set -x ip l s eth0 down ( wpa_cli terminate; exit 0 ) -rmmod iwlagn -modprobe iwlagn -sleep 2 + +( rmmod iwlagn; modprobe iwlagn; sleep 2 ) + wpa_supplicant -B -Dwext -iwlan0 -c ~nico/ethz/wlan/wpa_supplicant.conf sleep 5 udhcpc -nqfi wlan0 diff --git a/get-sysinfo.sh b/get-sysinfo.sh index 1920267..8a9ab69 100755 --- a/get-sysinfo.sh +++ b/get-sysinfo.sh @@ -1,14 +1,28 @@ #!/bin/sh -dest="${0%%*/}.log" +host="$(hostname)" +dest="${0%%*/}.${host}.log" ( + # system / software uname -a dmesg + + # pci stuff lspci -nn lspci -vv + + # hw in total lshw + + # ram free + + # cpu cat /proc/cpuinfo + # disk + mount + df -h + ) 2>&1 | tee "$dest" diff --git a/linux/t_downgradetest.sh b/linux/t_downgradetest.sh index d8edfd7..e11f2b3 100755 --- a/linux/t_downgradetest.sh +++ b/linux/t_downgradetest.sh @@ -41,6 +41,8 @@ else version="$(git tag | tail -n1)" fi +novversion=$(echo $version | sed 's/^v//') + echo "Building $version" echo "$version" > "$marker" @@ -48,31 +50,19 @@ git checkout -b "${__myname}-${version}" ${version} # build kernel make $parallel clean -make $parallel defconfig -#cat /boot/config-2.6.26-2-amd64 >> .config - -cat << eof -CONFIG_BNX2=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MPT2SAS=y -CONFIG_XFS_FS=y -CONFIG_EXT3_FS=y -eof ->> .config - +cat /boot/config-2.6.26-2-amd64 >> .config +yes "" | make $parallel oldconfig make $parallel all # install kernel make $parallel install modules_install -# copy kernel image -cp "arch/x86/boot/bzImage" "/boot/${__myname}" -#update-initramfs -c -k "$version" +# create initramfs +update-initramfs -c -k "$novversion" + +# copy images +cp "arch/x86/boot/bzImage" "/boot/vmlinuz-${__myname}" +cp "/boot/initrd.img-${novversion}" "/boot/initrd-${__myname}" # reboot #reboot diff --git a/monitor-xrandr-rechts.sh b/monitor-xrandr-rechts.sh index aad9d8d..f346d2f 100755 --- a/monitor-xrandr-rechts.sh +++ b/monitor-xrandr-rechts.sh @@ -1,3 +1,4 @@ #!/bin/sh +xrandr --output LVDS --auto xrandr --output VGA --auto xrandr --output VGA --right-of LVDS diff --git a/securemail b/securemail index 65ae103..b4816ad 100755 --- a/securemail +++ b/securemail @@ -21,7 +21,7 @@ HOST="home.schottelius.org" HOST="nico@77.109.138.222" ssh -T -f -C -N -L2323:mx3.schottelius.org:$IMAPS "$HOST" -ssh -T -f -C -N -L4242:mx3.schottelius.org:$SMTP "$HOST" +ssh -T -f -C -N -L4241:mx3.schottelius.org:$SMTP "$HOST" # Fernzugriff ssh -T -f -C -N -R4242:localhost:22 "$HOST"