Accepting request 815609 from home:fbui:systemd:openSUSE-Factory

- Don't restart udevd sockets during package update
  Otherwise we might miss kernel events as the daemon need to be
  stopped as well.

- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6)
  For a complete list of changes, visit:
  a6d31d1a02...b12cd8b89b

OBS-URL: https://build.opensuse.org/request/show/815609
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1103

systemd-mini.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jun 17 18:54:11 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Don't restart udevd sockets during package update
+
+  Otherwise we might miss kernel events as the daemon need to be
+  stopped as well.
+
+-------------------------------------------------------------------
+Wed Jun 17 09:03:40 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932
+
 -------------------------------------------------------------------
 Thu Jun  4 15:29:03 UTC 2020 - matthias.gerstner@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.122.ga6d31d1a02
+%define suse_version +suse.250.gb12cd8b89b
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -863,7 +863,7 @@ fi
 
 # Migrate old i18n settings previously configured in /etc/sysconfig to
 # the new locations used by systemd (/etc/locale.conf,
-# /etc/vconsole.conf, ...). Recent version of systemd parse the new
+# /etc/vconsole.conf, ...). Recent versions of systemd parse the new
 # locations only.
 #
 # This is needed both at package updates and package installations
@@ -903,13 +903,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-systemctl daemon-reload || :
-# On package update: the restart of the socket units will probably
-# fail as the daemon is most likely running. It's not really an issue
-# since we restart systemd-udevd right after and that will pull in the
-# socket units again. We should be informed at that time if something
-# really went wrong the first time we started the socket units.
-%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null
+# Restarting udevd sockets means also stopping the daemon. But we
+# don't want the sockets and the daemon to be inactive at the same
+# time because we might loose new events sent by the kernel during the
+# package update otherwise. Hence we accept the fact that the socket
+# properties might not be updated. They are unlikely changed anyway.
 %systemd_postun_with_restart systemd-udevd.service
 
 %posttrans -n udev%{?mini}

systemd-v245+suse.122.ga6d31d1a02.tar.xz

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

systemd-v245+suse.250.gb12cd8b89b.tar.xz

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

systemd.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jun 17 18:54:11 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Don't restart udevd sockets during package update
+
+  Otherwise we might miss kernel events as the daemon need to be
+  stopped as well.
+
+-------------------------------------------------------------------
+Wed Jun 17 09:03:40 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932
+
 -------------------------------------------------------------------
 Thu Jun  4 15:29:03 UTC 2020 - matthias.gerstner@suse.com
 

systemd.spec

@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.122.ga6d31d1a02
+%define suse_version +suse.250.gb12cd8b89b
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -861,7 +861,7 @@ fi
 
 # Migrate old i18n settings previously configured in /etc/sysconfig to
 # the new locations used by systemd (/etc/locale.conf,
-# /etc/vconsole.conf, ...). Recent version of systemd parse the new
+# /etc/vconsole.conf, ...). Recent versions of systemd parse the new
 # locations only.
 #
 # This is needed both at package updates and package installations
@@ -901,13 +901,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-systemctl daemon-reload || :
-# On package update: the restart of the socket units will probably
-# fail as the daemon is most likely running. It's not really an issue
-# since we restart systemd-udevd right after and that will pull in the
-# socket units again. We should be informed at that time if something
-# really went wrong the first time we started the socket units.
-%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null
+# Restarting udevd sockets means also stopping the daemon. But we
+# don't want the sockets and the daemon to be inactive at the same
+# time because we might loose new events sent by the kernel during the
+# package update otherwise. Hence we accept the fact that the socket
+# properties might not be updated. They are unlikely changed anyway.
 %systemd_postun_with_restart systemd-udevd.service
 
 %posttrans -n udev%{?mini}