diff --git a/21-openEuler.conf b/21-openEuler.conf deleted file mode 100644 index 1e8518dbe3887282b9eedeed52b8756400bc0a3d..0000000000000000000000000000000000000000 --- a/21-openEuler.conf +++ /dev/null @@ -1 +0,0 @@ -kernel.printk=4 4 1 7 diff --git a/90-default.preset b/90-default.preset index 1fcc9fc1bb1ee13a3c4ed0d43b24570ca1737ae5..0b45a87859dda64eb2ed023b041c8dd0faf5f94a 100644 --- a/90-default.preset +++ b/90-default.preset @@ -16,6 +16,7 @@ enable rpcbind.* enable NetworkManager.service enable NetworkManager-dispatcher.service enable ModemManager.service +enable auditd.service enable restorecond.service enable bluetooth.* enable avahi-daemon.* diff --git a/generic-release.spec b/generic-release.spec index a795128ab323d8024bfd61c62befa18c4c4dc881..b405ca4fd74e0d942f61da65bc6e16d68783dc96 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -6,7 +6,7 @@ %define generic_version 20.03 %define generic_patch_level LTS %define generic_patch_level_extend SP1 -%define generic_release 42 +%define generic_release 43 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -27,7 +27,6 @@ Source0: generic-release-%{builtin_release_version}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset Source3: 99-default-disable.preset -Source4: 21-openEuler.conf BuildRequires: python Requires: %{product_family}-repos @@ -111,10 +110,6 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/ -# copy system config file -mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d/ -install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysctl.d/ - %clean rm -rf $RPM_BUILD_ROOT @@ -136,13 +131,16 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/* /var/lib/supportinfo /usr/share/eula/eula.* -%config(noreplace) %{_sysconfdir}/sysctl.d/21-openEuler.conf %files -n openEuler-performance %defattr(0644,root,root,0755) /etc/profile.d/performance.sh %changelog +* Fri Jul 30 2021 yixiangzhike - 1.0-43 +- Revert "Turn off the audit service by default" +- Revert "Change the terminal output loglevel to 4" + * Thu Jul 22 2021 zhujunhao - 1.0-42 - Turn off the firewalld service by default