mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
|
diff -Nur livecd-tools-18.8.old/imgcreate/live.py livecd-tools-18.8/imgcreate/live.py
|
||
|
|
--- livecd-tools-18.8.old/imgcreate/live.py 2013-07-02 16:59:24.000000000 +0400
|
||
|
|
+++ livecd-tools-18.8/imgcreate/live.py 2013-07-02 17:01:09.395426345 +0400
|
||
|
|
@@ -451,12 +451,12 @@
|
||
|
|
|
||
|
|
shutil.copyfile(bootdir + "/vmlinuz-" + version,
|
||
|
|
isodir + "/isolinux/vmlinuz" + index)
|
||
|
|
- subprocess.call(["/usr/sbin/dracut", "/boot/initramfs-" + version + ".img", version],
|
||
|
|
+ subprocess.call(["/usr/sbin/dracut", "/boot/initrd-" + version + ".img", version],
|
||
|
|
preexec_fn = self._chroot)
|
||
|
|
|
||
|
|
isDracut = False
|
||
|
|
- if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
|
||
|
|
- shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
|
||
|
|
+ if os.path.exists(bootdir + "/initrd-" + version + ".img"):
|
||
|
|
+ shutil.copyfile(bootdir + "/initrd-" + version + ".img",
|
||
|
|
isodir + "/isolinux/initrd" + index + ".img")
|
||
|
|
isDracut = True
|
||
|
|
else:
|
||
|
|
@@ -876,11 +876,11 @@
|
||
|
|
|
||
|
|
shutil.copyfile(bootdir + "/vmlinuz-" + version,
|
||
|
|
destdir + "/vmlinuz")
|
||
|
|
- subprocess.call(["/usr/sbin/dracut", "/boot/initramfs-" + version + ".img", version],
|
||
|
|
+ subprocess.call(["/usr/sbin/dracut", "/boot/initrd-" + version + ".img", version],
|
||
|
|
preexec_fn = self._chroot)
|
||
|
|
|
||
|
|
- if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
|
||
|
|
- shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
|
||
|
|
+ if os.path.exists(bootdir + "/initrd-" + version + ".img"):
|
||
|
|
+ shutil.copyfile(bootdir + "/initrd-" + version + ".img",
|
||
|
|
destdir + "/initrd.img")
|
||
|
|
isDracut = True
|
||
|
|
else:
|