[f17 master] Don't use the bootloader config path to find the splash image (#807510)

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

 



On EFI the bootloader config file is in /boot/efi/EFI/redhat/grub.conf,
but the splash image is still what the fedora-logos package put in
/boot/grub/splash.xpm.gz , so use that path instead.
---
 pyanaconda/bootloader.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index ffa9632..ee7ae11 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1163,6 +1163,11 @@ class GRUB(BootLoader):
         return ""
 
     @property
+    def splash_dir(self):
+        """ relative path to splash image directory."""
+        return GRUB._config_dir
+
+    @property
     def serial_command(self):
         command = ""
         if self.console and self.console.startswith("ttyS"):
@@ -1265,13 +1270,13 @@ class GRUB(BootLoader):
 
         if not flags.serial:
             splash = "splash.xpm.gz"
-            splash_path = os.path.normpath("%s%s/%s" % (ROOT_PATH,
-                                                        self.config_dir,
+            splash_path = os.path.normpath("%s/boot/%s/%s" % (ROOT_PATH,
+                                                        self.splash_dir,
                                                         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\n" % (grub_root_grub_name,
-                                                         self.grub_config_dir,
+                                                         self.splash_dir,
                                                          splash))
                 config.write("hiddenmenu\n")
 
-- 
1.7.9.3

_______________________________________________
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