From c82f5f292f0c12b903dceb0f0590042039f29674408d880b77caa3f4099c8a08 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 9 May 2019 07:17:05 +0000 Subject: [PATCH] Accepting request 701727 from home:fbui:systemd:openSUSE-Factory - Add debug-only-remove-new-policies.patch A temporary patch to suppress the new DBUS methods introduced by v242 until they are reviewed and whitelisted by the secteam. - Add a comment explaining why static enablement symlinks in /etc are suppressed Also remove any /etc/systemd/system/*.requires/ symlinks for the same reason. - preset remote-cryptsetup.target during package installation This target is supposed to be part of the targets that should be enabled (or not depending on the presets) at package installation. OBS-URL: https://build.opensuse.org/request/show/701727 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1060 --- systemd-mini.changes | 24 ++++++++++++++++++++++++ systemd-mini.spec | 6 +++++- systemd.changes | 24 ++++++++++++++++++++++++ systemd.spec | 6 +++++- 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 93be9260..0cc3558c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu May 9 07:13:44 UTC 2019 - Franck Bui + +- Add debug-only-remove-new-policies.patch + + A temporary patch to suppress the new DBUS methods introduced by + v242 until they are reviewed and whitelisted by the secteam. + +------------------------------------------------------------------- +Thu May 9 07:11:08 UTC 2019 - Franck Bui + +- Add a comment explaining why static enablement symlinks in /etc are suppressed + + Also remove any /etc/systemd/system/*.requires/ symlinks for the + same reason. + +------------------------------------------------------------------- +Thu May 2 15:24:45 UTC 2019 - Franck Bui + +- preset remote-cryptsetup.target during package installation + + This target is supposed to be part of the targets that should be + enabled (or not depending on the presets) at package installation. + ------------------------------------------------------------------- Thu May 2 13:12:23 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 43d7d455..8ef239db 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -544,7 +544,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel -rm -rf %{buildroot}/etc/systemd/system/*.target.wants + +# Make sure we don't ship static enablement symlinks in /etc during +# installation, presets should be honoured instead. +rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. @@ -733,6 +736,7 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. +%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target diff --git a/systemd.changes b/systemd.changes index 93be9260..0cc3558c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu May 9 07:13:44 UTC 2019 - Franck Bui + +- Add debug-only-remove-new-policies.patch + + A temporary patch to suppress the new DBUS methods introduced by + v242 until they are reviewed and whitelisted by the secteam. + +------------------------------------------------------------------- +Thu May 9 07:11:08 UTC 2019 - Franck Bui + +- Add a comment explaining why static enablement symlinks in /etc are suppressed + + Also remove any /etc/systemd/system/*.requires/ symlinks for the + same reason. + +------------------------------------------------------------------- +Thu May 2 15:24:45 UTC 2019 - Franck Bui + +- preset remote-cryptsetup.target during package installation + + This target is supposed to be part of the targets that should be + enabled (or not depending on the presets) at package installation. + ------------------------------------------------------------------- Thu May 2 13:12:23 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 61ceaf5e..6c5b184e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -542,7 +542,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel -rm -rf %{buildroot}/etc/systemd/system/*.target.wants + +# Make sure we don't ship static enablement symlinks in /etc during +# installation, presets should be honoured instead. +rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. @@ -731,6 +734,7 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. +%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target