[Fedora-livecd-list] imgcreate/live.py

[Bruno Wolff III]

 imgcreate/live.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit d5b47ac2d861cc6e96e6ee94f2bf3f0d76361e12
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue Jul 27 05:11:47 2010 -0500

    Change live.py to use the new location of the vesa splash image.
    
    fedora-logos recently changed the location it uses for the vesa splash
    image. This breaks (bug 615443) live images built using fedora-logos.
    This patch changes the location that the image is fetched from to match
    the one used by fedora-logos.
    
    Note that generic-logos hasn't been changed to use the new location yet.
    To accommodate this as well as building older repos on F14, a fallback
    to using the old path is provided if the splash image is not found at
    the new location.

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 4f3bdd3..36fef63 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -372,10 +372,15 @@ class x86LiveImageCreator(LiveImageCreatorBase):
 
     def __copy_syslinux_background(self, isodest):
         background_path = self._instroot + \
-                          "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg"
+                          "/usr/share/anaconda/syslinux-vesa-splash.jpg"
 
         if not os.path.exists(background_path):
-            return False
+            # fallback to F13 location
+            background_path = self._instroot + \
+                              "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg"
+
+            if not os.path.exists(background_path):
+                return False
 
         shutil.copyfile(background_path, isodest)