From 926f553399afc2d8b25870296462135b98633186 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Thu, 25 Apr 2024 17:15:35 +0800
Subject: [PATCH] fix make image in docker

---
 CreateImage.spec               |  9 +++++++-
 fix-make-image-in-docker.patch | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 fix-make-image-in-docker.patch

diff --git a/CreateImage.spec b/CreateImage.spec
index 4f9d9f0..7715d25 100755
--- a/CreateImage.spec
+++ b/CreateImage.spec
@@ -1,6 +1,6 @@
 Name:        CreateImage
 Version:     1.0.0
-Release:     5
+Release:     6
 Summary:     The tool to create Machine Image
 Group:       System Environment/Base
 License:     Mulan PSL v2
@@ -8,6 +8,7 @@ Source0:     https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.
 Patch0001:   0001-fix-uname-r-error.patch
 Patch0002:   0001-Add-loongarch64-support-for-CreateImage.patch
 Patch0003:   add-some-packages-in-rpmlist.patch
+Patch0004:   fix-make-image-in-docker.patch
 BuildArch:   noarch
 Requires:    qemu-img bc
 
@@ -19,6 +20,7 @@ The tool to create Machine Image.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 %define env_kernel_version %(eval rpm -qi kernel-headers  | grep Version | awk '{print $NF}')
 %define enable_nomodeset %(eval echo %{env_kernel_version} 6.1.0 | awk '{if($1 >= $2) print 1;else print 0;}')
@@ -43,6 +45,11 @@ cp -a lib hooks config %{buildroot}/usr/share/CreateImage
 /usr/share/CreateImage
 
 %changelog
+* Mon Apr 29 2024 wangchong<wangchong56@huawei.com> - 1.0.0-6
+- ID:NA
+- SUG:NA
+- DESC: fix make image in docker
+
 * Wed Oct 25 2023 wangchong<wangchong56@huawei.com> - 1.0.0-5
 - ID:NA
 - SUG:NA
diff --git a/fix-make-image-in-docker.patch b/fix-make-image-in-docker.patch
new file mode 100644
index 0000000..2f9dc5c
--- /dev/null
+++ b/fix-make-image-in-docker.patch
@@ -0,0 +1,41 @@
+From 0531d0c6cf05986c4e671d7aabb42c60a8f9ca6b Mon Sep 17 00:00:00 2001
+From: wangchong1995924 <15229716099@163.com>
+Date: Thu, 25 Apr 2024 17:12:51 +0800
+Subject: [PATCH] fix make image in docker
+
+
+diff --git a/hooks/finalise.d/50-bootloader b/hooks/finalise.d/50-bootloader
+index cf261c9..449033a 100755
+--- a/hooks/finalise.d/50-bootloader
++++ b/hooks/finalise.d/50-bootloader
+@@ -42,6 +42,9 @@ function install_grub2_x86 ()
+     LEGACY_GRUB_CFG=/boot/grub2/grub.cfg
+     grub2-mkconfig -o $UEFI_GRUB_CFG
+     grub2-mkconfig -o $LEGACY_GRUB_CFG
++    sed_str="root=UUID=${ROOT_FS_UUID} "
++    sed -i "s#root=.*.img #${sed_str}#g" $UEFI_GRUB_CFG
++    sed -i "s#root=.*.img #${sed_str}#g" $LEGACY_GRUB_CFG
+ }
+ 
+ function install_grub2_efi ()
+@@ -66,6 +69,8 @@ function install_grub2_efi ()
+     echo "EOF" >> /etc/grub.d/00_header
+     GRUB_CFG=/boot/efi/EFI/openEuler/grub.cfg
+     grub2-mkconfig -o $GRUB_CFG
++    sed_str="root=UUID=${ROOT_FS_UUID} "
++    sed -i "s#root=.*.img #${sed_str}#g" $GRUB_CFG
+ }
+ 
+ function install_grub2_loongarch64 ()
+@@ -91,6 +96,8 @@ function install_grub2_loongarch64 ()
+     echo "EOF" >> /etc/grub.d/00_header
+     GRUB_CFG=/boot/efi/EFI/openEuler/grub.cfg
+     grub2-mkconfig -o $GRUB_CFG
++    sed_str="root=UUID=${ROOT_FS_UUID} "
++    sed -i "s#root=.*.img #${sed_str}#g" $GRUB_CFG
+ }
+ 
+ if [ -f /boot/grub2/device.map ]; then
+-- 
+2.27.0
+
-- 
Gitee