Search
j0ke.net Open Build Service
>
Projects
>
internetx
:
kiwi
:
Appliance
>
dracut
> 0026-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 0026-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch of Package dracut
From 580522add04ee23bfa30835529a447e24dc6d308 Mon Sep 17 00:00:00 2001 From: Harald Hoyer <harald@redhat.com> Date: Tue, 26 Jan 2016 12:26:03 +0100 Subject: [PATCH] network: if rd.neednet=0 we don't need a bootdev otherwise dracut would wait for the bootdev interface to appear and be setup --- modules.d/40network/parse-ip-opts.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh index 12f47659..5779ef88 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -40,6 +40,8 @@ if [ -n "$NEEDBOOTDEV" ] && getargbool 1 rd.neednet; then #[ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines" echo "rd.neednet=1" > /etc/cmdline.d/dracut-neednet.conf info "Multiple ip= arguments: assuming rd.neednet=1" +else + unset NEEDBOOTDEV fi # Check ip= lines @@ -48,17 +50,14 @@ for p in $(getargs ip=); do ip_to_var $p # make first device specified the BOOTDEV - if [ -z "$BOOTDEV" ] && [ -n "$dev" ]; then + if [ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEV" ] && [ -n "$dev" ]; then BOOTDEV="$dev" - [ -n "$NEEDBOOTDEV" ] && info "Setting bootdev to '$BOOTDEV'" + info "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 - # Empty autoconf defaults to 'dhcp' if [ -z "$autoconf" ] ; then warn "Empty autoconf values default to dhcp"