[rhel7-branch 6/9] parse-kickstart: just emit 'inst.dd=XXX' for driverdisk
wgwoods
installerbot-noreply at redhat.com
Thu Jul 9 15:18:34 UTC 2015
From: Will Woods <wwoods at redhat.com>
The fancy handling here is only needed because of the truly messed-up
way we were handling "inst.dd" compared to every other boot arg.
Fixing driverdisk handling makes this unnecessary.
Related: RHBZ#1084197
---
dracut/parse-kickstart | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 94b4069..a4f3666 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -143,23 +143,16 @@ class MediaCheck(commands.mediacheck.FC4_MediaCheck, DracutArgsMixin):
class DriverDisk(commands.driverdisk.F14_DriverDisk, DracutArgsMixin):
def dracut_args(self, args, lineno, obj):
- dd_net = []
- dd_disk = []
+ dd_args = []
for dd in self.driverdiskList:
if dd.partition:
- dd_disk.append(dd.partition)
+ dd_args.append("inst.dd=hd:%s" % dd.partition)
elif dd.source:
- dd_net.append("inst.dd=%s" % dd.source)
+ dd_args.append("inst.dd=%s" % dd.source)
+ elif dd.biospart:
+ dd_args.append("inst.dd=bd:%s" % dd.biospart)
- # disk sources cannot be added to cmdline because the initial
- # driver-update run has already finished.
- if dd_disk:
- with open("/tmp/dd_args_ks", "w") as f:
- f.write(" ".join(dd_disk))
-
- # network sources can be added to the existing cmdline, they
- # are processed later.
- return "\n".join(dd_net)
+ return "\n".join(dd_args)
class Network(commands.network.RHEL7_Network, DracutArgsMixin):
def dracut_args(self, args, lineno, net):
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/5657d9c9778a654051eeb7983cff2dd18a04c098
More information about the anaconda-patches
mailing list