[PATCH 2/2] make sure arm-boot-config is installed on arm systems and call a-b-c to setup a boot config

Brian C. Lane bcl at redhat.com
Thu Jun 6 17:16:18 UTC 2013


On Thu, Jun 06, 2013 at 11:31:02AM -0500, Dennis Gilmore wrote:
> Signed-off-by: Dennis Gilmore <dennis at 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)

Actually, this needs to be:

iutil.execWithRedirect("a-b-c", [], root=ROOT_PATH)

I'll fix it locally.

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 482 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20130606/64db8f5c/attachment.sig>


More information about the anaconda-patches mailing list