X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=c9920adcaa65777976b44095261a3432768b15dc;hb=c635641cb4de0af5ecfd94862ee85c87e34fe07a;hp=f94b3df3c551cf29ddece693bf9057a62a67aaa2;hpb=744835b3f429c89983adc3d83c27f5a1baebb7fe;p=grml-terminalserver.git diff --git a/grml-terminalserver-config b/grml-terminalserver-config index f94b3df..c9920ad 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Gebetsroither # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Nov 16 14:39:51 CET 2006 [mika] +# Latest change: Die Mär 27 13:34:47 CEST 2007 [mika] ################################################################################ @@ -38,7 +38,7 @@ IPRANGE_TO_="" NETWORK_="" OPTIONS_="" BOOT_ARGS_="" -NAT_INTERFACE_="none" +NAT_INTERFACE_="" ### @@ -56,7 +56,8 @@ COMMANDS: help This help text interactive Interactive Configuration of the grml-terminalserver - grubConf Configure grub and create boot-image (for non-PXE NICs) + grubConf Configure grub and create boot-image (for non-PXE NICs) + Read modules for grub from file if given. grubConfWrite Configure grub and write image to floppy disk grubWrite Write compiled grub-image to floppy disk grubMultiWrite batchwrite grub-image to floppy disk @@ -121,15 +122,34 @@ function actionAutoconf # INITRD {{{ - function actionMkInitrd { echo -n "Creating initrd $PATH_/minirt26.gz: " isExistent "$PATH_/minirt26.gz" && echo && echo "$PATH_/minirt26.gz exists already, skipping initrd creation" && return 0 - mkInitrd + if [ -e '/live/cow' ]; then + mkInitrdNew + else + mkInitrd + fi echo done } +function mkInitrdNew +{ + set -e + local cfg_="/etc/initramfs-tools/initramfs.conf" + local tmp_="`mktemp -t terminalserver__initramfsbk.XXXXXX`" + cp $cfg_ $tmp_ + sed -i 's/^MODULES=.*/MODULES=netboot/' $cfg_ + update-initramfs -u -t + mv $tmp_ $cfg_ + + local initrd_="/boot/initrd.img-$KERNEL_VERSION_" + mv $initrd_ $PATH_/minirt26.gz + mv ${initrd_}.bak $initrd_ + set +e +} + function mkInitrd { TMP_DIR_=`mktemp -td terminalserver_initrd.XXXXXX` @@ -154,13 +174,14 @@ function mkInitrd # implanting my initrd changes into the original initrd # copy programs, check if there are already links with this name to busybox - for i in $USR_SHARE_/timeout $USR_SHARE_/udhcpc $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir; do + for i in $USR_SHARE_/timeout $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir; do tmp_name_="${i##*/}" isNotExistent "$INITRD_/static/$tmp_name_" eprint || execute "rm $INITRD_/static/$tmp_name_" cp $i "$INITRD_/static/$tmp_name_" done cp $USR_SHARE_/linuxrc $INITRD_/ mkdir -p $INITRD_/mylib + mkdir -p $INITRD_/myusr # # which modules should i put into the ramdisk @@ -272,7 +293,7 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200. local grub_message_="Do you have any NON-PXE network cards you would like to boot from?" # on witch interfaces should we listen - local netdevices_="$(cat /proc/net/dev | awk -F: '/eth.:|tr.:/{print $1}')" + local netdevices_="$(grep -ve 'lo:' -ve 'Inter-|' -ve 'face |bytes' /proc/net/dev | awk -F: '{print $1}')" local device_list_="" for INTERFACE_ in $netdevices_; do device_list_="$device_list_ ${INTERFACE_} Networkcard_${INTERFACE_##eth}"; done echo -n "" >"$TMP_" @@ -330,8 +351,8 @@ the internet?" NAT_INTERFACE_="$GW_DEV_" else # no NAT, no sensible gateway - GW_= - NAT_INTERFACE_="none" + GW_="" + NAT_INTERFACE_="" fi fi @@ -395,9 +416,8 @@ Quite usefull examples: ssh= - Start ssh server and set password of user grml to pw services=<1,2,3> - Execute /etc/init.d/{1,2,3} start -console=ttyS0,9600n8 - Initialise seriell console -secure - Boot only restricted clients (without root permissions) -startx - Boot into X (should be used with secure) +console=ttyS0,9600n8 - Initialise serial console +startx - Boot into X " @@ -467,7 +487,7 @@ function grubConfig local tmp_=`mktemp -td terminalserver_grub.XXXXXX` || warn "could not create tmp file for grubConfig" if [ -z "$tmp_" ]; then return 1; fi - grubConfigWork $tmp_ + grubConfigWork "$tmp_" "$1" local ret_=$? execute "rm -rf $tmp_" warn @@ -486,19 +506,23 @@ If you networkcard is already listed press ! WARNING: DON't add all NIC's, grub could possibly stop working!!" local nics_="" - while read module_ desc_ mode_; do - nics_="$nics_ $module_ $desc_ $mode_" - done < $GRUB_NIC_CONF_ - - echo -n "" >$TMP_ - local cmd_line_="" - $DIALOG_ --clear --separate-output --backtitle "$BACK_TITLE_" --title "$grub_title_" --checklist \ - "$grub_nic_message_" 10 70 0 $nics_ 2>$TMP_ - local ret_=$? - if [[ $ret_ -ne 0 || `wc -l <$TMP_` -eq 0 ]]; then - echo $ret_ - warn "you should give me your specified NICs but didn't => DEFAULT will be used" - awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$TMP_ + if [[ $2 == "" ]]; then + while read module_ desc_ mode_; do + nics_="$nics_ $module_ $desc_ $mode_" + done < $GRUB_NIC_CONF_ + + echo -n "" >$TMP_ + local cmd_line_="" + $DIALOG_ --clear --separate-output --backtitle "$BACK_TITLE_" --title "$grub_title_" --checklist \ + "$grub_nic_message_" 10 70 0 $nics_ 2>$TMP_ + local ret_=$? + if [[ $ret_ -ne 0 || `wc -l <$TMP_` -eq 0 ]]; then + echo $ret_ + warn "you should give me your specified NICs but didn't => DEFAULT will be used" + awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$TMP_ + fi + else + cat $2 >$TMP_ fi while read module_; do cmd_line_="$cmd_line_ --enable-$module_" @@ -522,9 +546,12 @@ timeout 0 title Load config from Tftp server configfile (nd)/menu.lst EOT - #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read - execute "CC=gcc-3.3 ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read - execute "make -j2 CC=gcc-3.3" warn || read #return 1 + + CC='gcc' + test -r /lib64 && export CC="$CC -m32" + + CC="$CC" execute "./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read + CC="$CC" execute "make -j2" warn || read #return 1 local st1_="stage1/stage1" local st2_="stage2/stage2" @@ -624,7 +651,7 @@ fi case "$1" in interactive) actionInteractive ;; - grubConf) grubConfig ;; + grubConf) grubConfig "$2" ;; grubConfWrite) grubConfig && grubWrite ;; grubWrite) grubWrite ;; grubMultiWrite) grubMultiWrite "$2" ;;