mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
added initramfs to initrd patch
This commit is contained in:
parent
e7bf288d8f
commit
98f9e2c773
2 changed files with 37 additions and 1 deletions
34
livecd-tools-18.8.initramfs-initrd.patch
Normal file
34
livecd-tools-18.8.initramfs-initrd.patch
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
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:
|
|
@ -5,7 +5,7 @@
|
||||||
Summary: Tools for building live CDs
|
Summary: Tools for building live CDs
|
||||||
Name: livecd-tools
|
Name: livecd-tools
|
||||||
Version: 18.8
|
Version: 18.8
|
||||||
Release: 28
|
Release: 30
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
|
@ -29,6 +29,7 @@ Patch8: livecd-tools-18.8.splash.patch
|
||||||
Patch9: livecd-tools-18.8.fs_nls.patch
|
Patch9: livecd-tools-18.8.fs_nls.patch
|
||||||
Patch10: livecd-tools.get-name-from-lsb.patch
|
Patch10: livecd-tools.get-name-from-lsb.patch
|
||||||
Patch11: livecd-tools-18.8.vga.removal.patch
|
Patch11: livecd-tools-18.8.vga.removal.patch
|
||||||
|
Patch12: livecd-tools-18.8.initramfs-initrd.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
|
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
|
||||||
Requires: mkisofs
|
Requires: mkisofs
|
||||||
|
@ -88,6 +89,7 @@ like live image or appliances.
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
|
%patch12 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make
|
make
|
||||||
|
|
Loading…
Add table
Reference in a new issue