X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=324758038608091cb2f8addd711f92e431d56b4b;hb=9a40ef030a37167410d3c073ec3a279421ef56d4;hp=d06b75734d2d87fa9d7c9bb926337c5915f3cbac;hpb=2638c3a270deeed06bfe6938922d113338b6efa0;p=grml-terminalserver.git diff --git a/grml-terminalserver-config b/grml-terminalserver-config index d06b757..3247580 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 @@ -154,41 +155,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_/timeout $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, but do not include wlan/pcmcia/... related ones - # blacklist: proteon and depca as they seem to cause problems with udevsettle - find /lib/modules/${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 - # 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="" @@ -227,8 +211,9 @@ 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 @@ -347,8 +332,8 @@ the internet?" NAT_INTERFACE_="$GW_DEV_" else # no NAT, no sensible gateway - GW_= - NAT_INTERFACE_="none" + GW_="" + NAT_INTERFACE_="" fi fi @@ -412,9 +397,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 " @@ -484,7 +468,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 @@ -503,19 +487,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_" @@ -539,9 +527,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" @@ -641,7 +632,7 @@ fi case "$1" in interactive) actionInteractive ;; - grubConf) grubConfig ;; + grubConf) grubConfig "$2" ;; grubConfWrite) grubConfig && grubWrite ;; grubWrite) grubWrite ;; grubMultiWrite) grubMultiWrite "$2" ;;