59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
|
From 819be42f7f95d8bac0fd952a6fcc95df019064c7 Mon Sep 17 00:00:00 2001
|
||
|
From: Julian Wolf <juwolf@suse.de>
|
||
|
Date: Tue, 12 Aug 2014 17:11:44 +0200
|
||
|
Subject: Remove bootdev warning (bnc#881112)
|
||
|
|
||
|
Signed-off-by: Julian Wolf <juwolf@suse.de>
|
||
|
---
|
||
|
modules.d/40network/parse-ip-opts.sh | 19 ++-----------------
|
||
|
1 files changed, 2 insertions(+), 17 deletions(-)
|
||
|
|
||
|
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
|
||
|
index 13bc45c..abd8e17 100755
|
||
|
--- a/modules.d/40network/parse-ip-opts.sh
|
||
|
+++ b/modules.d/40network/parse-ip-opts.sh
|
||
|
@@ -21,23 +21,8 @@ if [ -n "$netroot" ] && [ -z "$(getarg ip=)" ] && [ -z "$(getarg BOOTIF=)" ]; th
|
||
|
return;
|
||
|
fi
|
||
|
|
||
|
-# Count ip= lines to decide whether we need bootdev= or not
|
||
|
-if [ -z "$NEEDBOOTDEV" ] ; then
|
||
|
- count=0
|
||
|
- for p in $(getargs ip=); do
|
||
|
- count=$(( $count + 1 ))
|
||
|
- done
|
||
|
- [ $count -gt 1 ] && NEEDBOOTDEV=1
|
||
|
-fi
|
||
|
-unset count
|
||
|
-
|
||
|
-# If needed, check if bootdev= contains anything usable
|
||
|
BOOTDEV=$(getarg bootdev=)
|
||
|
|
||
|
-if [ -n "$NEEDBOOTDEV" ] ; then
|
||
|
- [ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
|
||
|
-fi
|
||
|
-
|
||
|
# Check ip= lines
|
||
|
# XXX Would be nice if we could errorcheck ip addresses here as well
|
||
|
for p in $(getargs ip=); do
|
||
|
@@ -46,14 +31,14 @@ for p in $(getargs ip=); do
|
||
|
# make first device specified the BOOTDEV
|
||
|
if [ -z "$BOOTDEV" ] && [ -n "$dev" ]; then
|
||
|
BOOTDEV="$dev"
|
||
|
- [ -n "$NEEDBOOTDEV" ] && warn "Setting bootdev to '$BOOTDEV'"
|
||
|
+ warn "Setting bootdev to '$BOOTDEV'"
|
||
|
fi
|
||
|
|
||
|
# skip ibft since we did it above
|
||
|
[ "$autoconf" = "ibft" ] && continue
|
||
|
|
||
|
# We need to have an ip= line for the specified bootdev
|
||
|
- [ -n "$NEEDBOOTDEV" ] && [ "$dev" = "$BOOTDEV" ] && BOOTDEVOK=1
|
||
|
+ [ "$dev" = "$BOOTDEV" ] && BOOTDEVOK=1
|
||
|
|
||
|
# Empty autoconf defaults to 'dhcp'
|
||
|
if [ -z "$autoconf" ] ; then
|
||
|
--
|
||
|
1.7.6.1
|
||
|
|