The following patches update extlinux support to work with uboots inbuilt extlinux parsing. there will be a package added on arm extlinux-bootloader that provides syslinux-extlinux. only calxeda highbank systems are setup by default to read a extlinux.conf file. so to use this users will need to specify extlinux same as x86.
a-b-c is a script in arm-boot-config that writes out a boot.scr that works on most setups. while far from perfect it should allow us to support a number of systems by default.
these patches are for both master and f19-branch. in f20 we plan to switch to being able to use extlinux.conf by default.
Dennis
Signed-off-by: Dennis Gilmore dennis@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)
Signed-off-by: Dennis Gilmore dennis@ausil.us --- pyanaconda/bootloader.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index dadfabb..10fe43c 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -2075,7 +2075,7 @@ class ZIPL(BootLoader): class UBOOT(BootLoader): name = "UBOOT" _config_file = "boot.cmd" - packages = ['uboot-tools'] + packages = ['uboot-tools', 'arm-boot-config']
stage2_device_types = ["partition"]
@@ -2085,10 +2085,7 @@ class UBOOT(BootLoader):
@property def config_dir(self): - if self.stage2_device.format.mountpoint == "/boot/uboot/": - return "/boot/uboot" - else: - return "/boot" + return "/boot"
@property def config_file(self): @@ -2104,9 +2101,9 @@ class UBOOT(BootLoader): #
def install(self): - _outfile = "%s/boot.scr" % self.config_dir - args = ["-p", self.config_file, _outfile] - rc = iutil.execWithRedirect("cp", args, root=ROOT_PATH) + # a-b-c is a tool that generates a generic boor.scr that works in most situations. + # not perfect but is better than doing nothing + rc = iutil.execWithRedirect("a-b-c", root=ROOT_PATH)
if rc: raise BootLoaderError("bootloader install failed")
On Wed, 2013-06-05 at 19:59 -0500, Dennis Gilmore wrote:
The following patches update extlinux support to work with uboots inbuilt extlinux parsing. there will be a package added on arm extlinux-bootloader that provides syslinux-extlinux. only calxeda highbank systems are setup by default to read a extlinux.conf file. so to use this users will need to specify extlinux same as x86.
a-b-c is a script in arm-boot-config that writes out a boot.scr that works on most setups. while far from perfect it should allow us to support a number of systems by default.
these patches are for both master and f19-branch. in f20 we plan to switch to being able to use extlinux.conf by default.
Dennis
These both look good to me. Just please provide a short summary for the PATCH 1/2, so that it can be used as the first line of the commit message. The long text should appear as a separate paragraph.
anaconda-patches@lists.fedorahosted.org