Accepting request 830355 from Base:System

OBS-URL: https://build.opensuse.org/request/show/830355
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=315

systemd-mini.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)
+
+-------------------------------------------------------------------
+Wed Aug 26 09:46:46 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit a4e393eecb9dbe140a6c7d57419c291d786155cf
+
+  d8e3bd4e22 Revert "core: don't send SIGKILL to user@.service immediatly during shutdown"
+
+-------------------------------------------------------------------
+Tue Aug 25 14:32:16 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Drop requirement on 'sysvinit-tools'
+
+  It was used to workaround bug #886599 by explicitly calling
+  vhangup(8) from getty@.service so when this service was stopped a
+  virtually hangup on the specified terminal when were stopped to give
+  the shell a few seconds to save its history.
+
+  But this workaround was dropped since it had no effect (SLE12-GM was
+  released with it but was still suffering from the bug) and was
+  replaced by commit e9db43d5910717a108, which was released from v226
+  and backported to SLE12/SLE12-SP1.
+
 -------------------------------------------------------------------
 Thu Aug 20 10:24:37 UTC 2020 - Franck Bui <fbui@suse.com>
 

systemd-mini.spec

@@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.49.g6d6d92930a
+%define suse_version +suse.51.ga4e393eecb
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -123,7 +123,6 @@ Requires:       kbd
 Requires:       kmod >= 15
 Requires:       netcfg >= 11.5
 Requires:       systemd-presets-branding
-Requires:       sysvinit-tools
 Requires:       udev = %{version}-%{release}
 Requires:       util-linux >= 2.27.1
 Requires:       group(lock)
@@ -787,12 +786,7 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
 # a %pre that needs to be run during the build. systemd is one of them
 # so keep the section even if it's empty.
 %pre
-if [ $1 -gt 1 ] ; then
+:
-        case "$(systemctl show -pFragmentPath tmp.mount)" in
-        FragmentPath=/usr/lib/systemd/system/tmp.mount)
-                ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
-        esac
-fi
 
 %post
 # Make /etc/machine-id an empty file during package installation. On
@@ -870,6 +864,13 @@ fi
 # It's run only once.
 %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || :
 
+# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount.
+# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore,
+# so migrate the link to the new location.
+if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then
+        ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount
+fi
+
 %postun
 %systemd_postun
 # Avoid restarting logind until fixed upstream (issue #1163)

systemd-v245.7+suse.49.g6d6d92930a.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:309ed00d37594c68875d38be600ae9b51614a2958af6c5b73d0d5bad5ece96e3
-size 6302108

systemd-v245.7+suse.51.ga4e393eecb.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cce0a5990f8ddc03e1dcdb1af7f20331e3e885596710f8a68563882c50d31e
+size 6301856

systemd.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)
+
+-------------------------------------------------------------------
+Wed Aug 26 09:46:46 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit a4e393eecb9dbe140a6c7d57419c291d786155cf
+
+  d8e3bd4e22 Revert "core: don't send SIGKILL to user@.service immediatly during shutdown"
+
+-------------------------------------------------------------------
+Tue Aug 25 14:32:16 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Drop requirement on 'sysvinit-tools'
+
+  It was used to workaround bug #886599 by explicitly calling
+  vhangup(8) from getty@.service so when this service was stopped a
+  virtually hangup on the specified terminal when were stopped to give
+  the shell a few seconds to save its history.
+
+  But this workaround was dropped since it had no effect (SLE12-GM was
+  released with it but was still suffering from the bug) and was
+  replaced by commit e9db43d5910717a108, which was released from v226
+  and backported to SLE12/SLE12-SP1.
+
 -------------------------------------------------------------------
 Thu Aug 20 10:24:37 UTC 2020 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.49.g6d6d92930a
+%define suse_version +suse.51.ga4e393eecb
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -121,7 +121,6 @@ Requires:       kbd
 Requires:       kmod >= 15
 Requires:       netcfg >= 11.5
 Requires:       systemd-presets-branding
-Requires:       sysvinit-tools
 Requires:       udev = %{version}-%{release}
 Requires:       util-linux >= 2.27.1
 Requires:       group(lock)
@@ -785,12 +784,7 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
 # a %pre that needs to be run during the build. systemd is one of them
 # so keep the section even if it's empty.
 %pre
-if [ $1 -gt 1 ] ; then
+:
-        case "$(systemctl show -pFragmentPath tmp.mount)" in
-        FragmentPath=/usr/lib/systemd/system/tmp.mount)
-                ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
-        esac
-fi
 
 %post
 # Make /etc/machine-id an empty file during package installation. On
@@ -868,6 +862,13 @@ fi
 # It's run only once.
 %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || :
 
+# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount.
+# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore,
+# so migrate the link to the new location.
+if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then
+        ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount
+fi
+
 %postun
 %systemd_postun
 # Avoid restarting logind until fixed upstream (issue #1163)