From: Michael Prokop <mika@grml.org>
Date: Mon, 11 Jul 2011 22:51:20 +0000 (+0200)
Subject: Do not use "nodhcp" bootoption anymore, since recent ISOs have new way of network... 
X-Git-Tag: v0.99.14~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=2614b9011596f05ba4c4cb8aa8864962780b5ed7

Do not use "nodhcp" bootoption anymore, since recent ISOs have new way of network configuration.

With integration of recent live-boot versions we don't have DHCP
requests in grml-autoconfig anymore (which used to require the
nodhcp option to disable the request) but the initrd cares about
it. If we're using nodhcp for booting then the initrd won't
configure networking any longer at all, which means booting via
PXE doesn't work.

To make sure that the nodhcp bootoption isn't present in custom
live systems let's remove the option using grml2usb's
--remove-bootoption=nodhcp feature (grml2usb ftw!).

Acked by: Ulrich Dangel <mru@grml.org>
Acked by: Christian Hofstaedtler <ch@grml.org>
Acked by: Michael Gebetsroither <gebi@grml.org>
---

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 19b669c..de1e348 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -27,7 +27,7 @@ fi
 # default boot arguments used for both grub and pxelinux
 if [ -e '/live/cow' ]; then
     default_boot_args_="root=/dev/nfs rw nfsroot=$IP_:$MOUNT_POINT_ \
-nodhcp noprompt noeject"
+noprompt noeject"
 else
     default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
 init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
@@ -102,7 +102,9 @@ ret_=$?
 DEST_DIR=$(mktemp -d)
 if [ -d /live/image/boot ] ; then
   grml2usb --bootloader-only \
-      --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" /live/image "$DEST_DIR"
+      --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \
+      --remove-bootoption=nodhcp \
+      /live/image "$DEST_DIR"
 
   mv "$DEST_DIR"/boot/syslinux/* "$TFTPD_DATA_DIR_/"
   rmdir "$DEST_DIR"/boot/syslinux