change rescue parameter with legacy too, and enable eject in install

0012-change-rescue-parameter-with-new-anaconda.patch

@@ -1,12 +1,13 @@
-From 8a67d38e533dbbe114e4f7ca51fb24a854176239 Mon Sep 17 00:00:00 2001
+From 827754f12b73541273197eec7ba7a8a4b3eb2271 Mon Sep 17 00:00:00 2001
 From: sun_hai_10 <sunha10@huawei.com>
-Date: Tue, 29 Nov 2022 14:22:17 +0800
+Date: Thu, 8 Dec 2022 17:14:16 +0800
 Subject: [PATCH] change rescue parameter with new anaconda
 
 ---
- isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg    | 2 +-
- isomaker/80-openeuler/config_files/x86/grub2-efi.cfg    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 2 +-
+ isomaker/80-openeuler/config_files/x86/grub2-efi.cfg     | 2 +-
+ isomaker/80-openeuler/config_files/x86/isolinux.cfg      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg
 index 2d165e1..2cc19a8 100644
@@ -34,6 +35,19 @@ index fe2bc03..c7cb824 100644
  		initrdefi @INITRDPATH@
  	}
  }
+diff --git a/isomaker/80-openeuler/config_files/x86/isolinux.cfg b/isomaker/80-openeuler/config_files/x86/isolinux.cfg
+index 0471f42..1b3fae2 100644
+--- a/isomaker/80-openeuler/config_files/x86/isolinux.cfg
++++ b/isomaker/80-openeuler/config_files/x86/isolinux.cfg
+@@ -93,7 +93,7 @@ label rescue
+ 	and edit config files to try to get it booting again.
+   endtext
+   kernel vmlinuz
+-  append initrd=initrd.img @ROOT@ rescue quiet
++  append initrd=initrd.img @ROOT@ inst.rescue quiet
+ 
+ label memtest
+   menu label Run a ^memory test
 -- 
 2.23.0
 

0013-enable-eject-in-install.img.patch

@@ -0,0 +1,25 @@
+From 40e9deb6d6ba1d8ad07c9903ce326d2053afdeff Mon Sep 17 00:00:00 2001
+From: sun_hai_10 <sunha10@huawei.com>
+Date: Mon, 19 Dec 2022 21:32:23 +0800
+Subject: [PATCH] enable eject in install.img
+
+---
+ isomaker/80-openeuler/runtime-cleanup.tmpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl
+index 5bce798..256d013 100644
+--- a/isomaker/80-openeuler/runtime-cleanup.tmpl
++++ b/isomaker/80-openeuler/runtime-cleanup.tmpl
+@@ -305,7 +305,7 @@ removefrom sysvinit-tools /usr/bin/*
+ removefrom tar /usr/share/locale/*
+ removefrom usbutils /usr/bin/*
+ removefrom util-linux --allbut \
+-    /usr/bin/{dmesg,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \
++    /usr/bin/{dmesg,eject,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \
+     /etc/mtab /etc/pam.d/login /etc/pam.d/remote \
+     /usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \
+     /usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \
+-- 
+2.23.0
+

oemaker.spec

@@ -11,7 +11,7 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.4
-Release:        3
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -34,7 +34,8 @@ Patch0005:	0005-add-fpi_tail-param-for-grub.patch
 Patch0008:	0008-add-parse_everything_deb_exclude.patch
 Patch0010:	0010-do-not-cleanup-pkg.patch
 Patch0011:	0011-support-desktop-iso.patch
-Patch0012:      0012-change-rescue-parameter-with-new-anaconda.patch
+Patch0012:  0012-change-rescue-parameter-with-new-anaconda.patch
+Patch0013:  0013-enable-eject-in-install.img.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -142,6 +143,12 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Mon Dec 26 2022 sunhai <sunhai10@huawei.com> - 2.0.4-5
+- ID:NA
+- SUG:NA
+- DESC: change rescue parameter with legacy too
+        Enable eject in install.img
+
 * Thu Dec 15 2022 wangkai <wangkai385@h-partners.com> - 2.0.4-3
 - ID:NA
 - SUG:NA