From d3785b06ded116a9377e34fef3e661c7fe34f17b Mon Sep 17 00:00:00 2001 From: x30004928 Date: Wed, 20 Apr 2022 16:24:01 +0800 Subject: [PATCH] restore the automated kickstart function --- 0008-automated-kickstart-function.patch | 32 +++++++++++++++++++++++++ README.en.md | 3 ++- README.md | 3 ++- oemaker.spec | 8 ++++++- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 0008-automated-kickstart-function.patch diff --git a/0008-automated-kickstart-function.patch b/0008-automated-kickstart-function.patch new file mode 100644 index 0000000..fc8beba --- /dev/null +++ b/0008-automated-kickstart-function.patch @@ -0,0 +1,32 @@ +From 0e973208822aa9f61065a111f8ea5fd91742d519 Mon Sep 17 00:00:00 2001 +From: xyn-coder +Date: Wed, 20 Apr 2022 16:16:51 +0800 +Subject: [PATCH] automated kickstart function + +--- + isocut/isocut.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/isocut/isocut.py b/isocut/isocut.py +index fb6ab4a..75dc45d 100755 +--- a/isocut/isocut.py ++++ b/isocut/isocut.py +@@ -138,13 +138,14 @@ def check_input(): + parser.add_argument("dest_iso", help="destination iso image") + parser.add_argument("-t", metavar="temporary_path", default="/tmp", help="temporary path") + parser.add_argument("-r", metavar="rpm_path", help="extern rpm packages path") ++ parser.add_argument("-k", metavar="file_path", help="kickstart file") + + args = parser.parse_args() + ICONFIG.src_iso = args.source_iso + ICONFIG.dest_iso = args.dest_iso + ICONFIG.temp_path = args.t + ICONFIG.rpm_path = args.r +- ICONFIG.ks_file = None ++ ICONFIG.ks_file = args.k + + if ICONFIG.src_iso is None or ICONFIG.dest_iso is None: + print("Must specify source iso image and destination iso image") +-- +2.33.0 + diff --git a/README.en.md b/README.en.md index 3ae8985..41c3a5f 100644 --- a/README.en.md +++ b/README.en.md @@ -53,7 +53,7 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA ##### isocut -isocut _[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_ +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ positional arguments: @@ -64,4 +64,5 @@ isocut _[-h] [-t temporary path] [-r extern rpm path] origi -t the temporary path which must be an absolute path and must be greater than 8g -r extern rpm packages path + -k Kickstart file path -h show the help message and exit diff --git a/README.md b/README.md index 8efd9f2..3123943 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA ##### isocut -isocut _[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_ +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ positional arguments: @@ -65,4 +65,5 @@ isocut _[-h] [-t temporary path] [-r extern rpm path] origi -t the temporary path which must be an absolute path and must be greater than 8g -r extern rpm packages path + -k Kickstart file path -h show the help message and exit diff --git a/oemaker.spec b/oemaker.spec index 3ec7ce1..245247c 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.3 -Release: 4 +Release: 5 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -31,6 +31,7 @@ Patch0004: 0004-bugfix-I3OGUT.patch Patch0005: 0005-add-fpi_tail-param-for-grub.patch Patch0006: 0006-support-usb-flash-drive-mode.patch Patch0007: 0007-restore-env-after-selinux-status-changes.patch +Patch0008: 0008-automated-kickstart-function.patch %description a building tool for DVD ISO making and ISO cutting @@ -134,6 +135,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Apr 20 2022 xiangyuning - 2.0.3-5 +- ID:NA +- SUG:NA +- DESC: restore env after selinux status changes + * Tue Mar 15 2022 xiangyuning - 2.0.3-4 - ID:NA - SUG:NA