X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=630296fa86d5a0712f83170c6061e1e4983bdb9f;hb=da225c6b095bba27895bbfca4e0b2797aaa877ac;hp=bd0ec3810ddf4fd20cdd66c3a3a6b9dc3dc30f75;hpb=cbd3755b82a682a95a29ebe33928f3ac6cad633b;p=grml-terminalserver.git diff --git a/grml-terminalserver-config b/grml-terminalserver-config index bd0ec38..630296f 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,6 +38,7 @@ IPRANGE_TO_="" NETWORK_="" OPTIONS_="" BOOT_ARGS_="" +NAT_INTERFACE_="" ### @@ -55,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 @@ -93,6 +95,7 @@ IPRANGE_FROM_="$IPRANGE_FROM_" IPRANGE_TO_="$IPRANGE_TO_" OPTIONS_="$OPTIONS_" BOOT_ARGS_="$BOOT_ARGS_" +NAT_INTERFACE_="$NAT_INTERFACE_" EOT notice "config successfully safed to \"$CONF_FILE_\"" @@ -119,15 +122,34 @@ function actionAutoconf # INITRD {{{ - function actionMkInitrd { echo -n "Creating initrd $PATH_/minirt26.gz: " - isExistent "$PATH_/minirt26.gz" && echo "$PATH_/minirt26.gz does already exist, skipping initrd creation" && return 0 - mkInitrd + isExistent "$PATH_/minirt26.gz" && echo && echo "$PATH_/minirt26.gz exists already, skipping initrd creation" && return 0 + 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` @@ -152,38 +174,24 @@ 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_/discover* $USR_SHARE_/udhcpc $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir /usr/bin/ldd ;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/i386-uclibc-linux/lib - for i in libdl libc libuClibc ld-uClibc; do - cp -a $UCLIBC_PATH_/$i*.so* $INITRD_/myusr/i386-uclibc-linux/lib - done - - # copy data files for discover (discover-data) - mkdir -p $INITRD_/mylib/discover - cp /lib/discover/list.xml /lib/discover/pci-*.xml $INITRD_/mylib/discover/ + mkdir -p $INITRD_/myusr # # which modules should i put into the ramdisk # - # get cards detected by discover - if [ -f /lib/discover/pci.lst ] ; then - isNotExistent $CARDS_DETECTED_BY_DISCOVER && awk '/ethernet/{print $3}' /lib/discover/pci.lst |sort |uniq > $CARDS_DETECTED_BY_DISCOVER - else # newer discover does not provide /lib/discover/pci.lst, get a list of all network drivers therefore - isNotExistent $CARDS_DETECTED_BY_DISCOVER && \ - # find *all* network drivers - # find /lib/modules/`uname -r`/kernel/drivers/net/ -name \*.ko | sed 's#.*./## ; s#\.ko##' | sort | uniq > $CARDS_DETECTED_BY_DISCOVER - # find the ones supported by discover - for mod in `grep "name'>.*" /lib/discover/pci-device.xml | sed "s#.*name'>## ; s###" | sort -u`; do - find /lib/modules/${KERNEL_VERSION_}/kernel/drivers/net -name ${mod}.ko | sed 's#.*./## ; s#\.ko##' >> $CARDS_DETECTED_BY_DISCOVER - done - fi + # find *all* network drivers, but do not include wlan/pcmcia/... related ones + # blacklist: proteon and depca as they seem to cause problems with udevsettle + find ${MODULES_PATH_}/${KERNEL_VERSION_}/kernel/drivers/net/ -name \*.ko | \ + grep -v 'wireless\|wan\|hamradio\|wlan\|ppp\|irda\|pcmcia\|depca\|proteon' | \ + sed 's#.*./## ; s#\.ko##' | sort | uniq > $CARDS_DETECTED_BY_DISCOVER local modules="`cat $CARDS_DETECTED_BY_DISCOVER |xargs` af_packet" local modules_dep="" @@ -222,16 +230,18 @@ function mkInitrd cp $MODULES_PATH_/$KERNEL_VERSION_/kernel/$i "$tmp_path" done - # generate modules.dep + # copying modules.* cp $MODULES_PATH_/$KERNEL_VERSION_/modules.dep $mod_path_ + cp $MODULES_PATH_/$KERNEL_VERSION_/modules.alias $mod_path_ #grep "^\/lib\/modules\/$KERNEL_VERSION_\/kernel\/" $MODULES_PATH_/$KERNEL_VERSION_/modules.dep |\ # sed "s/\/lib\/modules\/$KERNEL_VERSION_\/kernel\//\/modules\//g" > $mod_path_/modules.dep # put everything into the new initrd local tmp_size=`du -s $INITRD_ |awk '{print $1}'` # in kB let tmp_size=$tmp_size+1000 - if (( $tmp_size >= 16000 )); then - warn "Your initrd is $tmp_size kByte large => TOO BIG (should be <= 16000kB)" + local max_size=24000 + if (( $tmp_size >= $max_size )); then + warn "Your initrd is $tmp_size kByte large => TOO BIG (should be <= ${max_size}kB)" warn "Please remove a few modules from $CARDS_DETECTED_BY_DISCOVER or edit $INITRD_ manually" return 1 fi @@ -283,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_" @@ -321,6 +331,30 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200. NAMESERVERS_=`netGetNameservers warn` GW_=`netGetDefaultGateway warn` + GW_DEV_=`/sbin/ip route get "$GW_" | awk '{ print $3; exit; }'` + if [ "$GW_DEV_" != "$INTERFACE_" ] && [ "$GW_DEV_" != "" ]; then + # GW_DEV_ of server is not the same device as the one serviced by dhcpd + # so it doesn't make sense to provide the GW_ address to the clients + local do_nat_="YES" + local do_nat_title_="Network Address Translation" + local do_nat_message_=" +Do you want to set up NAT so that clients booting from this +grml-terminalserver can use this machine also as gateway to +the internet?" + + $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$do_nat_title_" --yesno "$do_nat_message_" 15 75 || \ + do_nat_="NO" + if [ "$do_nat_" = "YES" ]; then + # user wants NAT, we give the clients the server address as + # gateway as well + GW_="$IP_" + NAT_INTERFACE_="$GW_DEV_" + else + # no NAT, no sensible gateway + GW_="" + NAT_INTERFACE_="" + fi + fi # grub @@ -382,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 " @@ -454,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 @@ -473,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_" @@ -509,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' + [ -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" @@ -611,7 +651,7 @@ fi case "$1" in interactive) actionInteractive ;; - grubConf) grubConfig ;; + grubConf) grubConfig "$2" ;; grubConfWrite) grubConfig && grubWrite ;; grubWrite) grubWrite ;; grubMultiWrite) grubMultiWrite "$2" ;;