a4aac89e0e
- Allow multiple configurations per network interface (bnc#887906) Add 0133-Allow-multiple-configurations-per-network-interface-.patch - Remove bootdev warning (bnc#881112) Add 0134-Remove-bootdev-warning-bnc-881112.patch - check for existance of 69-dm-lvm-metad.rules in modules_setup.sh, lvm module (bnc#891791) Add 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch - Moved persistent network rule revert to another file (was not in github): Delete: 0133-Remove-70-persistent-net.rules.patch Add: 0136-Revert-95udev-rules-add-persistent-network-rule.patch - dracut-use-fipscheck-openssl.patch: Switch from Mozilla NSS sha256hmac checking to fipscheck as recommended Add: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch - warpclock: Do not use warpclock module on S390(x), hwclock does not exist there (bnc#884513) Add 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch OBS-URL: https://build.opensuse.org/request/show/244813 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=178
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
|
|
|