From b68256937df573f135f55788365f0f392fe6cff8 Mon Sep 17 00:00:00 2001
From: htpeng <htpengc@isoftstone.com>
Date: Tue, 27 Dec 2022 09:14:57 +0800
Subject: [PATCH] remove invalid memtest

Signed-off-by: htpeng <htpengc@isoftstone.com>
---
 0014-remove-invalid-memtest.patch | 33 +++++++++++++++++++++++++++++++
 oemaker.spec                      |  8 +++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0014-remove-invalid-memtest.patch

diff --git a/0014-remove-invalid-memtest.patch b/0014-remove-invalid-memtest.patch
new file mode 100644
index 0000000..384999c
--- /dev/null
+++ b/0014-remove-invalid-memtest.patch
@@ -0,0 +1,33 @@
+From 7d7a3d41bfadd5bd77402fb0900c7670661b012a Mon Sep 17 00:00:00 2001
+From: htpeng <htpengc@isoftstone.com>
+Date: Fri, 23 Dec 2022 16:01:16 +0800
+Subject: [PATCH] Remove invalid memtest
+
+Signed-off-by: htpeng <htpengc@isoftstone.com>
+---
+ isomaker/80-openeuler/config_files/x86/isolinux.cfg | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/isomaker/80-openeuler/config_files/x86/isolinux.cfg b/isomaker/80-openeuler/config_files/x86/isolinux.cfg
+index 1b3fae2..84ad7bf 100644
+--- a/isomaker/80-openeuler/config_files/x86/isolinux.cfg
++++ b/isomaker/80-openeuler/config_files/x86/isolinux.cfg
+@@ -95,15 +95,6 @@ label rescue
+   kernel vmlinuz
+   append initrd=initrd.img @ROOT@ inst.rescue quiet
+ 
+-label memtest
+-  menu label Run a ^memory test
+-  text help
+-	If your system is having issues, a problem with your
+-	system's memory may be the cause. Use this utility to
+-	see if the memory is working correctly.
+-  endtext
+-  kernel memtest
+-
+ menu separator # insert an empty line
+ 
+ label local
+-- 
+2.34.1
+
diff --git a/oemaker.spec b/oemaker.spec
index bebe81b..0f95f08 100644
--- a/oemaker.spec
+++ b/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:        5
+Release:        6
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@ Patch0010:	0010-do-not-cleanup-pkg.patch
 Patch0011:	0011-support-desktop-iso.patch
 Patch0012:	0012-change-rescue-parameter-with-new-anaconda.patch
 Patch0013:	0013-enable-eject-in-install.img.patch
+Patch0014:	0014-remove-invalid-memtest.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -143,6 +144,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Tue Dec 27 2022 penghaitao <htpengc@isoftstone.com> - 2.0.4-6
+- ID:NA
+- SUG:NA
+- DESC: Remove invalid memtest
+
 * Mon Dec 26 2022 sunhai <sunhai10@huawei.com> - 2.0.4-5
 - ID:NA
 - SUG:NA