Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-23 15:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Got rid of initramfs

Browse source
This commit is contained in:
Konstantin Vlasov 2014-10-02 17:42:42 +04:00
parent d1567340b3
commit a17813efa0
2 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
livecd-tools-21.1.drop.initramfs.patch Normal file
View file

@ -0,0 +1,50 @@
diff --git a/imgcreate/live.py b/imgcreate/live.py
old mode 100755
new mode 100644
index a23efa7..cc69c19
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -473,15 +473,17 @@ class x86LiveImageCreator(LiveImageCreatorBase):
isodir + "/isolinux/vmlinuz" + index)
isDracut = False
- if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
- shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
- isodir + "/isolinux/initrd" + index + ".img")
- isDracut = True
- elif os.path.exists(bootdir + "/initrd-" + version + ".img"):
+ if os.path.exists(bootdir + "/initrd-" + version + ".img"):
shutil.copyfile(bootdir + "/initrd-" + version + ".img",
isodir + "/isolinux/initrd" + index + ".img")
- elif not self.base_on:
- logging.error("No initrd or initramfs found for %s" % (version,))
+ isDracut = True
+ else:
+ raise InitramfsError("Unable to create initrd-" + version + ".img")
+# elif os.path.exists(bootdir + "/initrd-" + version + ".img"):
+# shutil.copyfile(bootdir + "/initrd-" + version + ".img",
+# isodir + "/isolinux/initrd" + index + ".img")
+# elif not self.base_on:
+# logging.error("No initrd or initramfs found for %s" % (version,))
is_xen = False
if os.path.exists(bootdir + "/xen.gz-" + version[:-3]):
@@ -914,13 +916,14 @@ class ppcLiveImageCreator(LiveImageCreatorBase):
shutil.copyfile(bootdir + "/vmlinuz-" + version,
destdir + "/vmlinuz")
- 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:
- shutil.copyfile(bootdir + "/initrd-" + version + ".img",
- destdir + "/initrd.img")
+ raise InitramfsError("Unable to create initrd-" + version + ".img")
+# shutil.copyfile(bootdir + "/initrd-" + version + ".img",
+# destdir + "/initrd.img")
return isDracut

4
livecd-tools.spec
View file

@ -5,7 +5,7 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 21.1
Release: 11
Release: 12
Epoch: 1
License: GPLv2
Group: System/Base
@ -24,6 +24,7 @@ Patch7: livecd-tools-21.1.no.mac.img.patch
Patch8: livecd-tools-21.1.isolinux.plymouth.fixes.patch
Patch9: livecd-tools-21.1.efi.grub.cfg.patch
Patch10: livecd-tools-21.1.pkg.installation.fix.patch
Patch11: livecd-tools-21.1.drop.initramfs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@ -83,6 +84,7 @@ like live image or appliances.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
make