summaryrefslogtreecommitdiffstats
path: root/dracut
diff options
context:
space:
mode:
authorWill Woods <wwoods@redhat.com>2012-08-17 13:47:24 -0400
committerWill Woods <wwoods@redhat.com>2012-08-20 11:59:13 -0400
commitda7201963f34a6c6c8bf1bc35aef7d7121ea5b59 (patch)
tree85a3b50568bb6d428d21e42c3add708de7eff919 /dracut
parent01ff925970695783dad25cb0f24a19f1d67e96d7 (diff)
downloadanaconda-da7201963f34a6c6c8bf1bc35aef7d7121ea5b59.tar.gz
anaconda-da7201963f34a6c6c8bf1bc35aef7d7121ea5b59.tar.xz
anaconda-da7201963f34a6c6c8bf1bc35aef7d7121ea5b59.zip
parse-kickstart: fix crash with PXE + ks=file: (#844478)
Current dracut crashes (intentionally!) if you use 'ip=' arguments with 'BOOTIF='. Until that's fixed upstream, add a temporary workaround that skips writing 'ip=' arguments if 'BOOTIF' is present.
Diffstat (limited to 'dracut')
-rwxr-xr-xdracut/parse-kickstart7
1 files changed, 7 insertions, 0 deletions
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 5f4a35818..d792ac64a 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -111,6 +111,13 @@ class Network(commands.network.F16_Network):
# tell dracut to bring this device up
netline = ksnet_to_dracut(args, lineno, net, bootdev=True)
+ # HACK: current dracut dies if you have BOOTIF= and ip= together.
+ # Until that gets fixed upstream, we have to defer to dracut.
+ # XXX FIXME: remove this when dracut can handle BOOTIF+ip!
+ if 'BOOTIF' in proc_cmdline:
+ # let dracut use BOOTIF to bring up the network
+ netline = None
+
else:
# all subsequent 'network' lines require '--device'
if not net.device or net.device == "link":