FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian Development

 
 
LinkBack Thread Tools
 
Old 09-28-2011, 09:38 PM
Peter Jones
 
Default Fix the path for splash.xpm.gz in grub.conf

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 os.access(splash_path, os.R_OK):
grub_root_grub_name = self.grub_device_name(self.stage2_device)
config.write("splashimage=%s/%s/%s
" % (grub_root_grub_name,
- self.grub_config_dir,
+ self.boot_prefix,
splash))
config.write("hiddenmenu
")

--
1.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 09-28-2011, 10:09 PM
David Lehman
 
Default Fix the path for splash.xpm.gz in grub.conf

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
" % (grub_root_grub_name,
> - self.grub_config_dir,
> + self.boot_prefix,
> splash))
> config.write("hiddenmenu
")
>


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

Thread Tools




All times are GMT. The time now is 10:14 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org