Browse Source

network/parse-ip-opts.sh: relax bootdev handling

master
Harald Hoyer 13 years ago
parent
commit
7081e99735
  1. 8
      modules.d/40network/parse-ip-opts.sh

8
modules.d/40network/parse-ip-opts.sh

@ -40,9 +40,10 @@ fi @@ -40,9 +40,10 @@ fi
unset count

# If needed, check if bootdev= contains anything usable
BOOTDEV=$(getarg bootdev=)

if [ -n "$NEEDBOOTDEV" ] ; then
BOOTDEV=$(getarg bootdev=) || die "Please supply bootdev argument for multiple ip= lines"
[ -z "$BOOTDEV" ] && die "Bootdev argument is empty"
[ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
fi

# If ibft is requested, read ibft vals and write ip=XXX cmdline args
@ -96,9 +97,6 @@ for p in $(getargs ip=); do @@ -96,9 +97,6 @@ for p in $(getargs ip=); do
IFACES="$IFACES $dev"
fi

# Small optimization for udev rules
[ -z "$NEEDBOOTDEV" ] && [ -n "$dev" ] && BOOTDEV=$dev

# Do we need to check for specific options?
if [ -n "$NEEDDHCP" ] || [ -n "$DHCPORSERVER" ] ; then
# Correct device? (Empty is ok as well)

Loading…
Cancel
Save