Re: [Fedora-livecd-list] [PATCH] Handle initrd-generic dracut initrd's
On Wednesday, August 12 2009, Warren Togami said:
[PATCH] Handle initrd-generic dracut initrd's
Currently dist-f12 koji repo, but not yet f12-alpha.
This doesn't apply cleanly, but also a minor style nit
diff --git a/imgcreate/live.py b/imgcreate/live.py
index b98f7b3..c4381b2 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -361,8 +361,13 @@ class x86LiveImageCreator(LiveImageCreatorBase):
shutil.copyfile(bootdir + "/vmlinuz-" + version,
isodir + "/isolinux/vmlinuz" + index)
- shutil.copyfile(bootdir + "/initrd-" + version + ".img",
- isodir + "/isolinux/initrd" + index +
".img")
+ imgpath=bootdir + "/initrd-generic-" + version + ".img"
+ if os.path.exists(imgpath):
+ shutil.copyfile(imgpath,
+ isodir + "/isolinux/initrd" + index +
".img")
The style in livecd-tools is to either see if a path exists and then set
a variable or just use the path if it exists. eg
if os.path.exists("/some/path"):
myvar="/some/path"
else:
myvar="/some/other/path"
shutil.copy(...)
or
if os.path.exists("/some/path"):
shutil.copy("/some/path"...)
else:
...
Jeremy