mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 16:13:01 +00:00
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From 352ea57e29422b65a6efb75a2a4b397f99738a39 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||
|
|
Date: Thu, 28 May 2020 18:28:00 +0300
|
||
|
|
Subject: [PATCH] ppc64: Assume dracut is always used
|
||
|
|
|
||
|
|
---
|
||
|
|
imgcreate/live.py | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
||
|
|
index 7392283..cfb6d53 100644
|
||
|
|
--- a/imgcreate/live.py
|
||
|
|
+++ b/imgcreate/live.py
|
||
|
|
@@ -886,7 +886,6 @@ class ppcLiveImageCreator(LiveImageCreatorBase):
|
||
|
|
return { "32" : False, "64" : True }
|
||
|
|
|
||
|
|
def __copy_kernel_and_initramfs(self, destdir, version):
|
||
|
|
- isDracut = False
|
||
|
|
bootdir = self._instroot + "/boot"
|
||
|
|
|
||
|
|
makedirs(destdir)
|
||
|
|
@@ -897,11 +896,13 @@ class ppcLiveImageCreator(LiveImageCreatorBase):
|
||
|
|
if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
|
||
|
|
shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
|
||
|
|
destdir + "/initrd.img")
|
||
|
|
- isDracut = True
|
||
|
|
else:
|
||
|
|
shutil.copyfile(bootdir + "/initrd-" + version + ".img",
|
||
|
|
destdir + "/initrd.img")
|
||
|
|
|
||
|
|
+ # assume that dracut is always used in ROSA
|
||
|
|
+ # dracut is patched to make initrd, not initramfs
|
||
|
|
+ isDracut = True
|
||
|
|
return isDracut
|
||
|
|
|
||
|
|
def __get_basic_yaboot_config(self, **args):
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|