aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-07-10 05:21:18 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-10 17:26:25 +0800
commit002ecb6439f83b2fec89e1394196a5eccfeb35d2 (patch)
tree801ccdd8ea9a52d88718796023ca2faf12ebf12c
parent3a5933d51f28f21710397887d77e64f5b514d4f3 (diff)
downloadmeta-anaconda-002ecb6439f83b2fec89e1394196a5eccfeb35d2.tar.gz
meta-anaconda-002ecb6439f83b2fec89e1394196a5eccfeb35d2.tar.bz2
meta-anaconda-002ecb6439f83b2fec89e1394196a5eccfeb35d2.zip
python3-anaconda: update 0050-tweak-search-location-of-new-kernel-pkg.patch
It missed replacements, add them back Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0050-tweak-search-location-of-new-kernel-pkg.patch31
1 files changed, 27 insertions, 4 deletions
diff --git a/recipes-installer/anaconda/files/0050-tweak-search-location-of-new-kernel-pkg.patch b/recipes-installer/anaconda/files/0050-tweak-search-location-of-new-kernel-pkg.patch
index 8968ea9..248ce25 100644
--- a/recipes-installer/anaconda/files/0050-tweak-search-location-of-new-kernel-pkg.patch
+++ b/recipes-installer/anaconda/files/0050-tweak-search-location-of-new-kernel-pkg.patch
@@ -1,4 +1,4 @@
-From 8359a3ebd9fcb5324a645fe147030482f35437b4 Mon Sep 17 00:00:00 2001
+From 4749c5a409cb2c121c575cb15118f1b8ff136d75 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 29 Jun 2019 16:15:14 +0800
Subject: [PATCH] tweak search location of new-kernel-pkg
@@ -9,10 +9,24 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
+ pyanaconda/bootloader/grub2.py | 2 +-
pyanaconda/payload/__init__.py | 2 +-
- pyanaconda/payload/livepayload.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ pyanaconda/payload/livepayload.py | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/pyanaconda/bootloader/grub2.py b/pyanaconda/bootloader/grub2.py
+index 80b026a..bad0806 100644
+--- a/pyanaconda/bootloader/grub2.py
++++ b/pyanaconda/bootloader/grub2.py
+@@ -274,7 +274,7 @@ class GRUB2(BootLoader):
+ defaults.write("GRUB_DISABLE_RECOVERY=\"true\"\n")
+ #defaults.write("GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"\n")
+
+- if self.use_bls and os.path.exists(util.getSysroot() + "/usr/sbin/new-kernel-pkg"):
++ if self.use_bls and os.path.exists(util.getSysroot() + "/sbin/new-kernel-pkg"):
+ log.warning("BLS support disabled due new-kernel-pkg being present")
+ self.use_bls = False
+
diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
index 4fb40cb..8b48625 100644
--- a/pyanaconda/payload/__init__.py
@@ -27,9 +41,18 @@ index 4fb40cb..8b48625 100644
else:
log.warning("new-kernel-pkg does not exist - grubby wasn't installed? "
diff --git a/pyanaconda/payload/livepayload.py b/pyanaconda/payload/livepayload.py
-index 235a3b5..6a8d345 100644
+index 235a3b5..5052977 100644
--- a/pyanaconda/payload/livepayload.py
+++ b/pyanaconda/payload/livepayload.py
+@@ -166,7 +166,7 @@ class LiveImagePayload(Payload):
+ threadMgr.wait(THREAD_LIVE_PROGRESS)
+
+ # Live needs to create the rescue image before bootloader is written
+- if os.path.exists(util.getSysroot() + "/usr/sbin/new-kernel-pkg"):
++ if os.path.exists(util.getSysroot() + "/sbin/new-kernel-pkg"):
+ use_nkp = True
+ else:
+ log.warning("new-kernel-pkg does not exist - grubby wasn't installed?")
@@ -200,7 +200,7 @@ class LiveImagePayload(Payload):
util.execInSysroot("systemd-machine-id-setup", [])