X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver;h=ab28ff2612ea77b71fe4f9fbb5efde22596cc682;hb=58888c7de07621d6f7b2e4fcdc176ce969265d66;hp=d69a3e57057ba63735a298c2bb48738d35d64c92;hpb=c99d1c9800bbd0279e45f9acded818b14a96b7e7;p=grml-terminalserver.git diff --git a/grml-terminalserver b/grml-terminalserver index d69a3e5..ab28ff2 100755 --- a/grml-terminalserver +++ b/grml-terminalserver @@ -20,6 +20,7 @@ ### __VARIABLES ### +FORCE_='false' verbose_=0 # this file holds all variable definitions @@ -42,8 +43,9 @@ comming with grml. COMMANDS: help This help text - start Start services + start Start services (if all services are started, configs will be updated) stop Stop services + config Update config of given service (or from all if no services given) clean Stop all + remove config and boot files from services interactive @@ -52,31 +54,54 @@ SERVICES: dhcp Dhcp daemon nfs All necessary nfs daemons <> ALL services - + OPTIONS: -v verbose (show what is going on, v++) -h this help text + -f Force EOT } function killPortmapper { - /etc/init.d/portmap stop >/dev/null 2>&1 - killall -9 portmap + /etc/init.d/portmap stop >/dev/null &>/dev/null + killall -9 portmap &>/dev/null } # DHCP SERVICE {{{ function createDhcpConf { - execute "mv -fb \"$DHCPD_CONFIG_FILE_\" \"$DHCPD_CONFIG_FILE_.old\"" eprint &>/dev/null - - execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die + if [ -e "$DHCPD_CONFIG_FILE_" ]; then + if grep $CONFIG_PATTERN_ $DHCPD_CONFIG_FILE_ &>/dev/null; then + execute "mv -fb \"$DHCPD_CONFIG_FILE_\" \"$DHCPD_CONFIG_FILE_.old\"" eprint &>/dev/null + execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die + else + if [[ $FORCE_ == "true" ]]; then + execute "mv -fb \"$DHCPD_CONFIG_FILE_\" \"$DHCPD_CONFIG_FILE_.old\"" eprint &>/dev/null + execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die + else + warn "Not updating user edited configfile $DHCPD_CONFIG_FILE_, user -f to override" + fi + fi + else + execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die + fi } function removeDhcpConf { - rm -f "$DHCPD_CONFIG_FILE_" + if [ -e "$DHCPD_CONFIG_FILE_" ]; then + if grep $CONFIG_PATTERN_ $DHCPD_CONFIG_FILE_ &>/dev/null; then + rm -f "$DHCPD_CONFIG_FILE_" + else + if [[ $FORCE_ == "true" ]]; then + rm -f "$DHCPD_CONFIG_FILE_" + else + warn "Not deleting user edited configfile $DHCPD_CONFIG_FILE_, user -f to override" + fi + fi + fi } @@ -87,14 +112,16 @@ function stopDhcp rm -f /var/lib/dhcp3/dhcpd.leases* 2>/dev/null #FIXME touch /var/lib/dhcp3/dhcpd.leases } + function startDhcp { local conf_file_="$DHCPD_CONFIG_FILE_" - + test -f $DHCPD_BIN_ || die "could not find dhcpd \"$DHCPD_BIN_\"" start-stop-daemon --start --quiet --pidfile "$DHCPD_PID_" \ --exec "$DHCPD_BIN_" -- -cf "$conf_file_" -q "$INTERFACE_" || warn "problems starting dhcpd" } + function runDhcp { isExistent "$DHCPD_CONFIG_FILE_" || \ @@ -104,6 +131,29 @@ function runDhcp sleep 1 startDhcp } + +# make sure tcp/113 is rejected +function runIptables +{ + # something keeps answering all tftp requests with auth requests (SYN + # packets to the client tcp/113). Since the PXE client doesn't answer with + # RST, the auth query has to wait until it times out. Forbidding the + # terminalserver to send out packets to tcp/113 via iptables _greatly_ + # speeds up the process. But of course the real fix would be to have grml + # stop sending out auth queries to tftp clients. according to netstat, it + # is in.tftpd itself sending out the auth queries. + # Thanks to Marc Haber and Wolfgang Karall for noticing and current fix. + if [ -x /sbin/iptables ] ; then + if iptables -L | grep -q '^REJECT.*tcp-reset' ; then + echo "Rule for tcp/113 already present, nothing to be done." + else + echo -n "Rejecting tcp/113 via iptables to speed up speed up booting via PXE: " + iptables -A OUTPUT -p tcp --dport 113 -j REJECT --reject-with tcp-reset && echo done || echo failed + fi + else + warn "iptables executable not avilable" + fi +} # }}} # TFTP SERVICE {{{ @@ -114,7 +164,7 @@ function removeTftpConf function createTftpConf { removeTftpConf - + execute "mkdir $TFTPD_DATA_DIR_/pxelinux.cfg" die execute "install -m 644 /usr/lib/syslinux/pxelinux.0 $TFTPD_DATA_DIR_" die execute "install -m 644 $PATH_/minirt26.gz $TFTPD_DATA_DIR_" die @@ -146,6 +196,16 @@ function runTftp # NFS {{{ +function createNfsConfig +{ + execute "exportfs -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn +} + +function removeNfsConfig +{ + execute "exportfs -u -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn +} + function startNfs { /etc/init.d/portmap start @@ -153,14 +213,11 @@ function startNfs # FIXME /etc/init.d/nfs-kernel-server start $USR_SHARE_/nfs-kernel-server start - # FIXME Silly "/etc/init.d/nfs-kernel-server start" - # FIXME #246904 (init script does not start if no exports in /etc/exports) - execute "exportfs -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn - #execute "echo -e \"\n$MOUNT_POINT_ $NETWORK_/$NETMASK_(ro,no_root_squash,async)\" >> /etc/exports" warn + createNfsConfig } function stopNfs { - execute "exportfs -u -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn + removeNfsConfig if [[ `exportfs |wc -l` > 0 ]]; then dprint "There are other exports, not stopping NFS serivces" else @@ -171,11 +228,6 @@ function stopNfs } # }}} -function allreadyConfigured -{ - isExistent "$CONF_FILE_" dprint || return 1 - return 0 -} function createConfig { @@ -190,16 +242,17 @@ function createConfig function actionStart { createConfig - - echo -n "Starting tftpd..." - runTftp - echo "done" - echo -n "Starting dhcpd..." - runDhcp - echo "done" - echo -n "Starting nfs..." - startNfs - echo "done" + + echo -n "Starting tftpd: " + runTftp && echo done || echo failed + + echo -n "Starting dhcpd: " + runDhcp && echo done || echo failed + + runIptables + + echo "Starting nfs: " + startNfs && echo "Sucessfully finished startup of grml-terminalserver." || echo 'Startup of grml-terminalserver-config failed!' } function actionStop @@ -218,6 +271,19 @@ function actionClean stopNfs } +function updateConfig +{ + local service_="$1" + + case "$service_" in + "") createConfig ;; + tftp) createTftpConf ;; + dhcp) createDhcpConf ;; + nfs) removeNfsConfig; createNfsConfig ;; + *) warn "Service $service_ not available" ;; + esac +} + # SERVICES {{{ function serviceStart { @@ -250,8 +316,9 @@ function serviceStop ### __MAIN ### -while getopts "i:hv" opt; do +while getopts "fi:hv" opt; do case "$opt" in + f) FORCE_='true' ;; h) printUsage; exit ;; v) let verbose_=$verbose_+1 ;; ?) printUsage; exit 64 ;; @@ -285,7 +352,7 @@ PXE_BOOT_MSG_=\"$PXE_BOOT_MSG_\" PXE_BOOT_LOGO_=\"$PXE_BOOT_LOGO_\"" die "False configuration, please update $CONFIG_" fi - + case "$1" in clean) actionClean; exit 0 ;; esac @@ -299,7 +366,7 @@ while true; do "grml-terminalserver-config returned an error, do you want to quit now?" 5 75 && exit 1 else break - fi + fi done source $CONF_FILE_ @@ -325,10 +392,11 @@ fi case "$1" in start) serviceStart "$2" ;; stop) serviceStop "$2" ;; + config) updateConfig "$2" ;; "") actionStart ;; *) printUsage ;; esac # END OF FILE ################################################################################ -# vim:foldmethod=marker +# vim:foldmethod=marker tabstop=2 expandtab shiftwidth=2