aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-07-10 05:20:07 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-10 17:26:25 +0800
commit3a5933d51f28f21710397887d77e64f5b514d4f3 (patch)
treeae79f41cd5ee567c223cd8eb76ac6eb34c02a442
parent9b9c6aff39f5e2aa8f8344b1f2556d3b0f168b02 (diff)
downloadmeta-anaconda-3a5933d51f28f21710397887d77e64f5b514d4f3.tar.gz
meta-anaconda-3a5933d51f28f21710397887d77e64f5b514d4f3.tar.bz2
meta-anaconda-3a5933d51f28f21710397887d77e64f5b514d4f3.zip
python3-anaconda: fix btrfs partition failed
Do not create fake initramfs if it has already generated Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0042-support-initramfs-boot.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/recipes-installer/anaconda/files/0042-support-initramfs-boot.patch b/recipes-installer/anaconda/files/0042-support-initramfs-boot.patch
index d3cb9c3..777255d 100644
--- a/recipes-installer/anaconda/files/0042-support-initramfs-boot.patch
+++ b/recipes-installer/anaconda/files/0042-support-initramfs-boot.patch
@@ -1,4 +1,4 @@
-From 1db96277f77da61f3b771a8c0fc7be898d7dca42 Mon Sep 17 00:00:00 2001
+From cedfb60b4cea33edcc6308875a5c8b2aa255bc20 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 29 Jun 2019 15:46:45 +0800
Subject: [PATCH] support initramfs boot
@@ -12,20 +12,22 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/bootloader/installation.py | 3 +++
+ pyanaconda/bootloader/installation.py | 5 +++++
pyanaconda/payload/__init__.py | 4 ++++
- 2 files changed, 7 insertions(+)
+ 2 files changed, 9 insertions(+)
diff --git a/pyanaconda/bootloader/installation.py b/pyanaconda/bootloader/installation.py
-index b620ab3..c28564f 100644
+index b620ab3..c2c097f 100644
--- a/pyanaconda/bootloader/installation.py
+++ b/pyanaconda/bootloader/installation.py
-@@ -50,6 +50,9 @@ def write_boot_loader(storage, payload):
+@@ -50,6 +50,11 @@ def write_boot_loader(storage, payload):
# Install the boot loader.
if not storage.bootloader.skip_bootloader:
+ for kernel in payload.kernel_version_list:
-+ open(util.getSysroot()+"/boot/initramfs-%s.img" % kernel, "w").write("\n")
++ initrd = util.getSysroot()+"/boot/initramfs-%s.img" % kernel
++ if not os.path.exists(initrd):
++ open(initrd, "w").write("\n")
+
install_boot_loader(storage)