Skip to content

Commit

Permalink
parse-kickstart: just emit 'inst.dd=XXX' for driverdisk
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
wgwoods committed Jul 7, 2015
1 parent b4a2f3f commit 8a4ba33
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions dracut/parse-kickstart
Expand Up @@ -155,23 +155,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(TMPDIR+"/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.F22_Network, DracutArgsMixin):
def dracut_args(self, args, lineno, net):
Expand Down

0 comments on commit 8a4ba33

Please sign in to comment.