X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=blobdiff_plain;f=grml-terminalserver-config;h=b14a7b6fb3e71d4c142e7d21b78b1e346c7bf00a;hp=61cd0569646f09f7f6fc96a837f08c0913292158;hb=03bd4d097461b19b788b40247ef10885c03be14a;hpb=3e8c788ea8c40ac8e705b30eaa4fad9e45a18e43 diff --git a/grml-terminalserver-config b/grml-terminalserver-config index 61cd056..b14a7b6 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -1,10 +1,9 @@ -#!/bin/sh +#!/bin/bash # Filename: terminalserver-config # Purpose: configuration program for grml-terminalserver # 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] ################################################################################ @@ -38,7 +37,7 @@ IPRANGE_TO_="" NETWORK_="" OPTIONS_="" BOOT_ARGS_="" -NAT_INTERFACE_="none" +NAT_INTERFACE_="" ### @@ -56,10 +55,6 @@ COMMANDS: help This help text interactive Interactive Configuration of the grml-terminalserver - grubConf Configure grub and create boot-image (for non-PXE NICs) - grubConfWrite Configure grub and write image to floppy disk - grubWrite Write compiled grub-image to floppy disk - grubMultiWrite batchwrite grub-image to floppy disk initrd Only create the initrd clean Remove all configfiles created during user configuration interactive mode @@ -119,134 +114,18 @@ 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 - echo done + echo "Installing initrd $PATH_/minirt26.gz:" + # until we have a stable file location API let's use + # an according heuristic + initrd_=initrd.img-"$(uname -r)" + cp /boot/"$initrd_" "$PATH_"/minirt26.gz || die "Could not copy /boot/$initrd_" } -function mkInitrd -{ - TMP_DIR_=`mktemp -td terminalserver_initrd.XXXXXX` - local i='' - local tmp_loopname='' - - # copying original initrd into $INITRD - execute "rm -r $INITRD_" 2>/dev/null - execute "cp $ORIGINAL_INITRD_ $TMP_DIR_/minirt26.gz" warn || return 1 - execute "mkdir -p $INITRD_" warn || return 1 - execute "mkdir -p $PATH_/mini-root.orig" warn || return 1 - execute "gunzip $TMP_DIR_/minirt26.gz" warn || return 1 - tmp_loopname=`findNextFreeLoop die` - execute "mount -o loop=$tmp_loopname $TMP_DIR_/minirt26 $PATH_/mini-root.orig " warn || return 1 - execute "cp -a $PATH_/mini-root.orig/* $INITRD_" warn || return 1 - execute "umount $PATH_/mini-root.orig" warn || return 1 - losetup -d $tmp_loopname &>/dev/null - tmp_loopname='' - execute "rmdir $PATH_/mini-root.orig" warn || return 1 - execute "rm $TMP_DIR_/minirt26" warn || return 1 - - # 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_/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 - # - - # 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="" - - # get paths of modules + paths of all dependent modules - echo -n "" >"$TMP_" - for i in $modules; do - tmp_=`awk -F: '{if($1~/'"$i".ko'/) {print $0}}' $MODULES_PATH_/$KERNEL_VERSION_/modules.dep` - echo "${tmp_%%:*}" - # FIXME ugly sed hack :( - echo "${tmp_#*:}" | xargs -n1 echo | sed 's/://' - done \ - | sort | uniq | while read module relax; do - if [ -n "$module" ]; then - echo "$module" >> $TMP_ - fi - done - - # copy modules + dependend modules into ramdisk - local mod_path_="$INITRD_/mylib/modules/$KERNEL_VERSION_" - local tmp_dst_path_="$mod_path_/kernel" - mkdir -p $tmp_dst_path_ - cat $TMP_ |sort |uniq |while read module; do - local tmp_path=${module#*/kernel/} - tmp_path=$tmp_dst_path_/${tmp_path%/*.ko} - local module_path=$tmp_path/${module##/*/} - - isNotExistent "$tmp_path" dprint && mkdir -p "$tmp_path" - isNotExistent "$module_path" dprint && cp "$MODULES_PATH_ROOT_DIFF_/$module" "$module_path" - done - - # copying additional modules - for i in fs/nfs/nfs.ko net/sunrpc/sunrpc.ko fs/lockd/lockd.ko net/packet/af_packet.ko; do - local tmp_path="$tmp_dst_path_/${i%/*}" - mkdir -p $tmp_path - cp $MODULES_PATH_/$KERNEL_VERSION_/kernel/$i "$tmp_path" - done - - # 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 - 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 - - execute "dd if=/dev/zero of=$TMP_DIR_/minirt26 bs=${tmp_size}k count=1 &>/dev/null" warn || \ - warn "could not create filesystem image" - - tmp_loopname=`findNextFreeLoop die` - execute "losetup $tmp_loopname $TMP_DIR_/minirt26" die - execute "mke2fs -L \"GRML NETINIT\" -b 1024 -N 8192 -O none -F -q -m 0 $tmp_loopname" warn - - execute "mkdir $PATH_/minirt26_mountp" warn - execute "mount $tmp_loopname $PATH_/minirt26_mountp" warn - execute "cp -a $INITRD_/* $PATH_/minirt26_mountp" warn - execute "umount $PATH_/minirt26_mountp" warn - execute "losetup -d $tmp_loopname &>/dev/null" warn - execute "rmdir $PATH_/minirt26_mountp" warn - execute "gzip -9 $TMP_DIR_/minirt26" warn - execute "rm -r $INITRD_" warn - execute "mv $TMP_DIR_/minirt26.gz $PATH_" - execute "rm -fr $TMP_DIR_" -} # }}} - # INTERACTIVE CONFIGURATION {{{ function actionInteractive @@ -258,7 +137,7 @@ function actionInteractive local card_title_="Choose network device connected to client network" local card_message_="Available network devices:" local iprange_title_="IP Address range for clients" -local iprange_message_=" + local iprange_message_=" Please enter the desired IP-Range of addresses that should be allocated by clients, separated by a single space. Example: @@ -269,11 +148,9 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200. " local runconfig_title_="Networkcard config" local runconfig_message_="Would you like to configure your interfaces now?" - local grub_title_="Grub configuration" - 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}')" + # on which interfaces should we listen + 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_" @@ -290,6 +167,12 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200. done IPRANGE_FROM_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMin/{print $2}'` + # if we have x.x.x.1 as starting range adress provide + # x.x.x.10 instead so we avoid possible conflicts with + # default gateway + if echo $IPFROM | grep -c '\.1$' ; ; then + IPFROM="${IPFROM%%\.1}.10" + fi IPRANGE_TO_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMax/{print $2}'` NETWORK_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/Network:/{print $2}'` NETWORK_=${NETWORK_%/*} @@ -331,19 +214,11 @@ the internet?" NAT_INTERFACE_="$GW_DEV_" else # no NAT, no sensible gateway - GW_= - NAT_INTERFACE_="none" + GW_="" + NAT_INTERFACE_="" fi fi - - # grub - echo -n "" >"$TMP_" - local grub_write_="YES" - $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$grub_title_" --yesno "$grub_message_" 5 75 && \ - grubConfig || grub_write_="NO" - - # get options #local OPT_IPTABLES_="yes" #local OPT_SSH_="yes" @@ -396,9 +271,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 " @@ -407,9 +281,6 @@ startx - Boot into X (should be used with secure) BOOT_ARGS_="$BOOT_ARGS_ $(<$TMP_)" writeConfig - if [ $grub_write_ == "YES" ]; then - grubWrite - fi actionMkInitrd notice "GRML terminalserver successfully configured" } @@ -423,7 +294,7 @@ function optGrml2Hd local options_='BOOT_IMAGE=grml2hd' # get partition to install grml2hd on - OPTIONS_PARTITION_MSG_='Please give me the target partition where to install grml' + OPTIONS_PARTITION_MSG_='Please specify the target partition where to install grml' PARTITION_TITLE_='Partition selection' echo -n "" >"$TMP_" $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$PARTITION_TITLE_" --inputbox \ @@ -432,7 +303,7 @@ function optGrml2Hd options_="$options_ $tmp_" # get filesystem type - OPTION_FS_TYPE_='Please give me the filesystem type' + OPTION_FS_TYPE_='Please specify the filesystem type' FS_TITLE_='Filesystem selection' echo -n "" >"$TMP_" $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$FS_TITLE_" --inputbox \ @@ -441,7 +312,7 @@ function optGrml2Hd options_="$options_ $tmp_" # get where to save mbr - OPTION_MBR_='Please give me the location where to save the mbr' + OPTION_MBR_='Please specify the location where to save the mbr' MBR_TITLE_='Select location of mbr' echo -n "" >"$TMP_" $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$MBR_TITLE_" --inputbox \ @@ -462,105 +333,6 @@ function optGrml2Hd } #}}} -# GRUB CONFIG {{{ -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_ - local ret_=$? - execute "rm -rf $tmp_" warn - - return $ret_ -} - -function grubConfigWork -{ - local tmp_="$1" - - local grub_title_="Grub configuration" - local grub_nic_message_=" -Give me the types of network cards you would want to boot from. -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_ - fi - while read module_; do - cmd_line_="$cmd_line_ --enable-$module_" - done < $TMP_ - - echo "\"$cmd_line_\"" - - execute "tar xzf $GRUB_SOURCE_ -C $tmp_" warn || return 1 - execute "cd $tmp_/grub*" warn || return 1 -cat >preset-menu < $PATH_/grub.img" warn || return 1 - return 0 -} - -function grubWrite -{ - local grub_title_="Grub configuration" - $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$grub_title_" --yesno \ - "Do you want to write your grub image to /dev/fd0" 5 75 || return 1 - - execute "dd if=$PATH_/grub.img of=/dev/fd0" warn || return 0 - return 1 -} - -function grubMultiWrite -{ - local target_=${1:-'/dev/fd0'} - - isExistent "$PATH_/grub.img" die "you must give me an image or run \"$PROG_NAME__ grubconf\"" - isExistent "$target_" die "$target_ is not a valied" - while true; do - echo -n "Please insert disk into $target_ and press (STRG-C for end)" - read - dd if=$PATH_/grub.img of="$target_" - done -} -# }}} - function removeTmpFiles { @@ -569,7 +341,7 @@ function removeTmpFiles function actionClean { - for i in dhcpd.conf grub.img minirt26.gz; do + for i in dhcpd.conf minirt26.gz; do execute "rm -f $PATH_/$i*" done @@ -625,10 +397,6 @@ fi case "$1" in interactive) actionInteractive ;; - grubConf) grubConfig ;; - grubConfWrite) grubConfig && grubWrite ;; - grubWrite) grubWrite ;; - grubMultiWrite) grubMultiWrite "$2" ;; initrd) actionMkInitrd ;; clean) actionClean ;; *) actionInteractive ;;