On 03/27/2014 12:56 PM, Brian C. Lane wrote:
The change for gathering up multiple modprobe.blacklist entries has
caused some other problems with the expectation that entries will be
overwritten instead of appended. This returns to the overwrite behavior,
except for cmdline args listed in constants.CMDLINE_APPEND
Related: rhbz#1073130
---
pyanaconda/constants.py | 3 +++
pyanaconda/flags.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
index 8de29a9..266eb53 100644
--- a/pyanaconda/constants.py
+++ b/pyanaconda/constants.py
@@ -151,3 +151,6 @@ FIRSTBOOT_ENVIRON = "firstboot"
# Tainted hardware
UNSUPPORTED_HW = 1 << 28
+
+# cmdline arguments that append instead of overwrite
+CMDLINE_APPEND = ["modprobe.blacklist"]
diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index cbba624..fc4a331 100644
--- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py
@@ -166,8 +166,8 @@ class BootArgs(OrderedDict):
key = i
val = None
- # Duplicate args create a space separated string
- if self.get(key, None):
+ # Some duplicate args create a space separated string
+ if key in CMDLINE_APPEND and self.get(key, None):
if val:
self[key] = self[key] + " " + val
else:
Looks fine, just be sure to add the import for CMDLINE_APPEND on master