small extlinux f19 update (write initrd line separately)

Matthew Miller mattdm at fedoraproject.org
Thu Jun 6 18:35:51 UTC 2013


I think it's possibly tabs vs spaces that grubby is extra-sensitive to. In
any case, this works and I've tested it, and is better than putting initrd
on the append line (which was also having problems where grubby would add
its own initrd line).





-- 
Matthew Miller  ☁☁☁  Fedora Cloud Architect  ☁☁☁  <mattdm at fedoraproject.org>
-------------- next part --------------
>From 5172644f10b83647c4565fad1a0fe85900be2d67 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm at fedoraproject.org>
Date: Thu, 6 Jun 2013 14:07:59 -0400
Subject: [PATCH] separate initrd line for extlinux

---
 pyanaconda/bootloader.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 440dd0c..ccd15d2 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2144,16 +2144,17 @@ class EXTLINUX(BootLoader):
         for image in self.images:
             args = Arguments()
             args.add("root=%s" % image.device.fstabSpec)
-            args.add("initrd=%s/%s" % (self.boot_prefix, image.initrd))
             args.update(self.boot_args)
             log.info("bootloader.py: used boot args: %s " % args)
             stanza = ("label %(label)s (%(version)s)\n"
                       "\tkernel %(boot_prefix)s/%(kernel)s\n"
-                      "\tappend %(args)s\n\n"
+                      "\tappend %(args)s\n"
+                      "\tinitrd %(boot_prefix)s/%(initrd)s\n\n"
                       % {"label": self.image_label(image),
                          "version": image.version,
                          "kernel": image.kernel,
                          "args": args,
+                         "initrd": image.initrd,
                          "boot_prefix": self.boot_prefix})
             config.write(stanza)
 
-- 
1.8.2.1



More information about the anaconda-patches mailing list