Accepting request 1202876 from Base:System

- Import commit 8a0ae4d90aff1d067a125ff9366eafc7dd5d4701 (merge of v256.6)
  For a complete list of changes, visit:
  bef0958f4d...8a0ae4d90a

- Don't try to restart the udev socket units anymore (bsc#1228809)
  There's currently no way to restart a socket activable service and its socket
  units "atomically" and safely.

- Move 80-container-host0.network back to the network sub-package (bsc#1229098)
  Rev 428 mistakenly moved it to the container sub-package.

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

files.container

@@ -19,7 +19,6 @@
 %{_mandir}/man8/systemd-nsresourced.service.8.gz
 %endif
 %if %{with networkd}
-%{_systemd_util_dir}/network/80-container-host0.network
 %{_systemd_util_dir}/network/80-container-vb.link
 %{_systemd_util_dir}/network/80-container-vb.network
 %{_systemd_util_dir}/network/80-container-ve.link

files.network

@@ -33,6 +33,7 @@
 %{_systemd_util_dir}/network/80-6rd-tunnel.link
 %{_systemd_util_dir}/network/80-6rd-tunnel.network
 %{_systemd_util_dir}/network/80-auto-link-local.network.example
+%{_systemd_util_dir}/network/80-container-host0.network
 %{_systemd_util_dir}/network/80-container-host0-tun.network
 %{_systemd_util_dir}/network/80-vm-vt.link
 %{_systemd_util_dir}/network/80-vm-vt.network

systemd-v256.5+suse.7.gbef0958f4d.tar.xz

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

systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz

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

systemd.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Sep 18 09:31:40 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Import commit 8a0ae4d90aff1d067a125ff9366eafc7dd5d4701 (merge of v256.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/bef0958f4db1b774c23505e93537ffe16f1b3894...8a0ae4d90aff1d067a125ff9366eafc7dd5d4701
+
+-------------------------------------------------------------------
+Tue Aug 27 08:04:14 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Don't try to restart the udev socket units anymore (bsc#1228809)
+
+  There's currently no way to restart a socket activable service and its socket
+  units "atomically" and safely.
+
+-------------------------------------------------------------------
+Mon Aug 26 10:51:51 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Move 80-container-host0.network back to the network sub-package (bsc#1229098)
+
+  Rev 428 mistakenly moved it to the container sub-package.
+
 -------------------------------------------------------------------
 Mon Aug 19 15:00:19 UTC 2024 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -26,9 +26,9 @@
 %define systemd_release    %{?release_override}%{!?release_override:0}
 %define archive_version    %{nil}
 %else
-%define systemd_version    256.5
+%define systemd_version    256.6
 %define systemd_release    0
-%define archive_version    +suse.7.gbef0958f4d
+%define archive_version    +suse.8.g8a0ae4d90a
 %endif
 
 %define systemd_major      %{sub %systemd_version 1 3}
@@ -1182,22 +1182,8 @@ fi
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-
+# Restarting udev socket units along with udevd is not safe (bsc#1228809).
-# The order of the units being restarted is important here because there's
+%systemd_postun_with_restart systemd-udevd.service
-# currently no way to queue multiple jobs into a single transaction
-# atomically. Therefore systemctl will create 3 restart jobs that can be handled
-# by PID1 separately and if the jobs for the sockets are being handled first
-# then starting them again will fail as the service is still active hence the
-# sockets held by udevd. However if the restart job for udevd is handled first,
-# there should be enough time to queue the socket jobs before the stop job for
-# udevd is processed. Hence PID1 will automatically sort the restart jobs
-# correctly by stopping the service then the sockets and then by starting the
-# sockets and the unit.
-#
-# Note that when systemd-udevd is restarted, there will always be a short time
-# frame where no socket will be listening to the events sent by the kernel, no
-# matter if the socket unit is restarted in first or not.
-%systemd_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket
 %systemd_postun_with_restart systemd-timesyncd.service
 %systemd_postun systemd-pstore.service