[PATCH 1/2] dont pass initrd as a argument, add default entry
Dennis Gilmore
dennis at ausil.us
Thu Jun 6 16:31:01 UTC 2013
have initrd on seperate line for extlinux rather than passed as a boot argument both options are valid and supported but this way we can use the code on arm also set a default entry line so that autoboot will work on arm
Signed-off-by: Dennis Gilmore <dennis at ausil.us>
---
pyanaconda/bootloader.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 440dd0c..dadfabb 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2144,15 +2144,16 @@ 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"
+ "\tinitrd %(boot_prefix)s/%(initrd)s\n"
"\tappend %(args)s\n\n"
% {"label": self.image_label(image),
"version": image.version,
"kernel": image.kernel,
+ "initrd": image.initrd,
"args": args,
"boot_prefix": self.boot_prefix})
config.write(stanza)
@@ -2165,6 +2166,7 @@ class EXTLINUX(BootLoader):
"menu hidden\n\n"
"timeout %(timeout)d\n"
"#totaltimeout 9000\n\n"
+ "default %(default)\n\n"
% { "productName": productName, "timeout": self.timeout *10,
"default": self.image_label(self.default)})
config.write(header)
--
1.8.2.1
More information about the anaconda-patches
mailing list