[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Fix instData removal mis merge



This reverses 1 chunck of commit d6d4c4800ebc2958eb87a706e4a7c799647ca447
as that chunck was caused by a mis merge (and is wrong).
---
 booty/bootloaderInfo.py |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index 35e9bc9..0c4882b 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -91,14 +91,8 @@ class KernelArguments:
         types = {}
         root = self.anaconda.storage.rootDevice
         for d in self.anaconda.storage.devices:
-            if root.dependsOn(d):
-                dracutSetupString = d.dracutSetupString()
-                if len(dracutSetupString):
-                    args += " %s" % dracutSetupString
-                import storage
-                if isinstance(d, storage.devices.NetworkStorageDevice):
-                    args += " "
-                    args += self.network.dracutSetupString(d)
+            if d is not root and not root.dependsOn(d):
+                continue
 
             s = d.dracutSetupString()
             types[s.split("=")[0]] = True
-- 
1.6.6.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]