[PATCH 1/2] Drop workaround for old dracut BOOTIF+ip problem

Will Woods wwoods at redhat.com
Tue May 13 15:59:55 UTC 2014


The problem been fixed upstream (see dracut commit d8a6987).
---
 dracut/parse-kickstart | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 021526d..43f5790 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -149,14 +149,6 @@ class Network(commands.network.F21_Network):
                 net.device = self.handler.ksdevice
             # 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":
-- 
1.9.0



More information about the anaconda-patches mailing list