From 2ab8caf221a5ab74f884b7930e7ee0e99fbd5d77 Mon Sep 17 00:00:00 2001 From: t_feng Date: Thu, 16 Jan 2020 05:52:01 +0800 Subject: [PATCH] delete udisk2-iscsi --- lorax-delete-udisk2-iscsi.patch | 25 +++++++++++++++++++++++++ lorax.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 lorax-delete-udisk2-iscsi.patch diff --git a/lorax-delete-udisk2-iscsi.patch b/lorax-delete-udisk2-iscsi.patch new file mode 100644 index 0000000..0d33467 --- /dev/null +++ b/lorax-delete-udisk2-iscsi.patch @@ -0,0 +1,25 @@ +From aa3cc4336717848d64008e5fa0a57a091e1d1989 Mon Sep 17 00:00:00 2001 +From: songnannan +Date: Thu, 16 Jan 2020 05:45:09 +0800 +Subject: [PATCH] delete udisk2-iscsi + +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 6bee5e6..9cf6b5b 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -106,7 +106,7 @@ installpkg xfsdump + + ## extra storage packages + # hostname is needed for iscsi to work, see RHBZ#1593917 +-installpkg udisks2 udisks2-iscsi hostname ++installpkg udisks2 hostname + + ## extra libblockdev plugins + installpkg libblockdev-lvm-dbus +-- +1.8.3.1 + diff --git a/lorax.spec b/lorax.spec index a73af65..aa9def7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ Name: lorax Version: 29.16 -Release: 7 +Release: 8 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -19,6 +19,7 @@ Patch9006: disable-GeoIP.patch Patch9007: eliminate-difference.patch Patch9008: lorax-enable-GUI-installation.patch Patch9009: lorax-enable-anaconda-KdumpSpoke.patch +Patch9010: lorax-delete-udisk2-iscsi.patch BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic BuildRequires: python3-nose python3-pytest-mock python3-pocketlint python3-gevent @@ -115,6 +116,7 @@ build images, etc. from the command line. %patch9007 -p1 %patch9008 -p1 %patch9009 -p1 +%patch9010 -p1 %endif %build @@ -191,6 +193,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* Thu Jan 16 2020 openEuler Buildteam - 29.16-8 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:delete udisk2-iscsi + * Wed Jan 15 2020 openEuler Buildteam - 29.16-7 - Type:bugfix - Id:NA -- Gitee