5 for dev in $devlist ; do
6 param="$(get_ipconfig_para $dev)"
7 - if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
8 + if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] && [ "$DHCP" != "Force" ] ; then
9 echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
12 --- a/scripts/live-bottom/23networking_grml
13 +++ b/scripts/live-bottom/23networking_grml
18 + # if boot option "nodhcp" is set but also boot option "dhcp" is
19 + # set, then dhcp should win over it as we default to dhcp and if
20 + # nodhcp is used as default boot option but "dhcp" is added then it
21 + # would be confusing to not get a working network setup
22 + if [ "$DHCP" = "Force" ] ; then
27 allow-hotplug ${interface}
28 iface ${interface} inet ${method}