From b55c502028e1bfaa1879e163267b59092bc79488 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Mon, 20 Feb 2023 11:10:28 +0800 Subject: [PATCH] do not move usr/libexec/anaconda/auditd Signed-off-by: Chunmei Xu --- ...not-move-usr-libexec-anaconda-auditd.patch | 28 +++++++++++++++++++ lorax-templates-anolis.spec | 11 ++++---- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 1004-do-not-move-usr-libexec-anaconda-auditd.patch diff --git a/1004-do-not-move-usr-libexec-anaconda-auditd.patch b/1004-do-not-move-usr-libexec-anaconda-auditd.patch new file mode 100644 index 0000000..295936a --- /dev/null +++ b/1004-do-not-move-usr-libexec-anaconda-auditd.patch @@ -0,0 +1,28 @@ +From b807f9fe3a70053a5f47c2de513ae4a931c9fc11 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Mon, 20 Feb 2023 11:07:23 +0800 +Subject: [PATCH] do not move usr/libexec/anaconda/auditd + +ananconda-38.7 has removed autitd + +Signed-off-by: Chunmei Xu +--- + 80-anolis/runtime-postinstall.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/80-anolis/runtime-postinstall.tmpl b/80-anolis/runtime-postinstall.tmpl +index 76ccc06..5bddf03 100644 +--- a/80-anolis/runtime-postinstall.tmpl ++++ b/80-anolis/runtime-postinstall.tmpl +@@ -91,8 +91,6 @@ replace "root:\*:" "root::" etc/shadow + install ${configdir}/org.gtk.Settings.Debug.gschema.override usr/share/glib-2.0/schemas + runcmd chroot ${root} glib-compile-schemas /usr/share/glib-2.0/schemas + +-move usr/libexec/anaconda/auditd sbin +- + ## for compatibility with Ancient Anaconda Traditions + symlink lib/modules /modules + symlink lib/firmware /firmware +-- +2.19.1.6.gb485710b + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 917ed96..5e8d1ed 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 Name: lorax-templates-anolis Version: 37.0 Release: 1.%{anolis_release}%{?dist} @@ -13,6 +13,7 @@ Source0: lorax-templates-anolis-37.0.tar.gz Patch1001: 1001-custom-config.patch Patch1002: 1002-add-uefi-parameter.patch Patch1003: 1003-Do-not-remove-avahi-glib-avahi-libs.patch +Patch1004: 1004-do-not-move-usr-libexec-anaconda-auditd.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -22,10 +23,7 @@ Anolis OS 23 specific Lorax templates for creating the boot.iso and live isos ar placed in %{templatedir} %prep -%setup -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 +%autosetup -p1 %build # nothing to build @@ -40,6 +38,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Mon Feb 20 2023 Chunmei Xu - 37.0-1.3 +- do not move usr/libexec/anaconda/auditd in runtime-postinstall.tmpl + * Fri Jan 06 2023 Chang Gao - 37.0-1.2 - Do not remove avahi-glib and avahi-libs in runtime-cleanup.tmpl -- Gitee