Re: [PATCH] Fix the path for splash.xpm.gz in grub.conf

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 2011-09-28 at 17:38 -0400, Peter Jones wrote:
> It's always in /boot/grub/splash.xpm.gz because that's where the package
> puts it.  It's not always in the config dir.
> ---
>  pyanaconda/bootloader.py |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index adef315..26009f0 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1159,14 +1159,14 @@ class GRUB(BootLoader):
>          self.write_config_console(config)
>  
>          if not flags.serial:
> -            splash = "splash.xpm.gz"
> +            splash = "grub/splash.xpm.gz"
>              splash_path = os.path.normpath("%s%s/%s" % (install_root,
> -                                                        self.config_dir,
> +                                                        self.boot_prefix,
>                                                          splash))

if isinstance(self, EFIGRUB):
  splash_dir = super(self, EFIGRUB).config_dir
else:
  splash_dir = self.config_dir

then "..." % (..., splash_dir, ...)

That saves you from hardcoding "/grub" in there. Same thing below, I
think.

Dave

>              if os.access(splash_path, os.R_OK):
>                  grub_root_grub_name = self.grub_device_name(self.stage2_device)
>                  config.write("splashimage=%s/%s/%s\n" % (grub_root_grub_name,
> -                                                         self.grub_config_dir,
> +                                                         self.boot_prefix,
>                                                           splash))
>                  config.write("hiddenmenu\n")
>  


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux