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

[Warren Togami 砥上勇]

 imgcreate/live.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 28a1b27b3053e09c5aa99336bf52f5714f3f5610
Author: Warren Togami <wtogami at redhat.com>
Date:   Thu Sep 10 14:19:03 2009 -0400

    dracut output image filename s/initrd-generic/initramfs/

diff --git a/imgcreate/live.py b/imgcreate/live.py
index c49b358..478aab0 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -365,8 +365,8 @@ class x86LiveImageCreator(LiveImageCreatorBase):
                         isodir + "/isolinux/vmlinuz" + index)
 
         isDracut = False
-        if os.path.exists(bootdir + "/initrd-generic-" + version + ".img"):
-            shutil.copyfile(bootdir + "/initrd-generic-" + version + ".img",
+        if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
+            shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
                             isodir + "/isolinux/initrd" + index + ".img")
             isDracut = True
         else:
@@ -674,7 +674,7 @@ class ppcLiveImageCreator(LiveImageCreatorBase):
         shutil.copyfile(bootdir + "/vmlinuz-" + version,
                         destdir + "/vmlinuz")
 
-        if os.path.exists(bootdir + "/initrd-generic-" + version + ".img"):
+        if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
             shutil.copyfile(bootdir + "/initrd-" + version + ".img",
                             destdir + "/initrd.img")
             isDracut = True