!161 restore the automated kickstart function

From: @xyncoder 
Reviewed-by: @xinsheng3, @zhuchunyi 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2022-04-27 01:35:10 +00:00 committed by Gitee
commit 34e22dbcec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 43 additions and 3 deletions

View File

@ -0,0 +1,32 @@
From 0e973208822aa9f61065a111f8ea5fd91742d519 Mon Sep 17 00:00:00 2001
From: xyn-coder <xiangyuninig@huawei.com>
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

View File

@ -53,7 +53,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
##### isocut
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
positional arguments:
@ -64,4 +64,5 @@ isocut <font color=#0000FF >_[-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

View File

@ -54,7 +54,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
##### isocut
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
positional arguments:
@ -65,4 +65,5 @@ isocut <font color=#0000FF >_[-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

View File

@ -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 <xiangyuning@huawei.com> - 2.0.3-5
- ID:NA
- SUG:NA
- DESC: restore env after selinux status changes
* Tue Mar 15 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-4
- ID:NA
- SUG:NA