1 files changed, 28 insertions, 15 deletions
diff --git a/recipes-installer/anaconda/files/0044-fix-installed-system-boot-from-encrypt-fs-failed.patch b/recipes-installer/anaconda/files/0044-fix-installed-system-boot-from-encrypt-fs-failed.patch
index 877e55f..6ee10cc 100644
--- a/recipes-installer/anaconda/files/0044-fix-installed-system-boot-from-encrypt-fs-failed.patch
+++ b/recipes-installer/anaconda/files/0044-fix-installed-system-boot-from-encrypt-fs-failed.patch
@@ -27,26 +27,39 @@ loop dependency with lvm2, so ommit systemd module in dracut.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Replace util.getSysroot() with conf.target.system_root.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Rebase for anaconda 34.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Update context because 0042-support-initramfs-boot.patch updated for
+anaconda 37.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
- pyanaconda/payload/__init__.py | 5 +++++
+ pyanaconda/modules/storage/bootloader/utils.py | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
-index 0da743e..4fb40cb 100644
---- a/pyanaconda/payload/__init__.py
-+++ b/pyanaconda/payload/__init__.py
-@@ -574,6 +574,11 @@ class Payload(metaclass=ABCMeta):
-         for subdir in ["log", "tmp"]:
-             util.mkdirChain(util.getSysroot() + "/var/volatile/%s" % subdir)
+diff --git a/pyanaconda/modules/storage/bootloader/utils.py b/pyanaconda/modules/storage/bootloader/utils.py
+index d25c51ee3..d53538d3a 100644
+--- a/pyanaconda/modules/storage/bootloader/utils.py
++++ b/pyanaconda/modules/storage/bootloader/utils.py
+@@ -294,6 +294,11 @@ def recreate_initrds(sysroot, kernel_versions):
+     for subdir in ["log", "tmp"]:
+         make_directories(conf.target.system_root + "/var/volatile/%s" % subdir)
  
-+        with open(util.getSysroot() + "/etc/dracut.conf.d/cryptsetup.conf", "w") as f:
-+            f.write('add_drivers+=" aesni_intel"\n')
-+            f.write('add_drivers+=" aes_x86_64"\n')
-+            f.write('omit_dracutmodules+=" systemd"\n')
++    with open(conf.target.system_root + "/etc/dracut.conf.d/cryptsetup.conf", "w") as f:
++        f.write('add_drivers+=" aesni_intel"\n')
++        f.write('add_drivers+=" aes_x86_64"\n')
++        f.write('omit_dracutmodules+=" systemd"\n')
 +
-         for kernel in self.kernel_version_list:
-             log.info("recreating initrd for %s", kernel)
-             if not conf.target.is_image:
+     for kernel in kernel_versions:
+         log.info("Recreating initrd for %s", kernel)
+ 
 -- 
 2.7.4