Accepting request 957371 from Base:System

- Fix a regression caused by the split of the sysusers config files shipped by
  systemd (bsc#1196322)
  Calls to %sysusers_create were not updated accordingly.

- spec: fix dependencies for mini variants (follow-up)
  systemd-mini-container is one of the sub-package that relies systemd-mini to
  conflict with kiwi and to not be installed on real systems.

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

systemd.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Feb 24 13:23:35 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Fix a regression caused by the split of the sysusers config files shipped by
+  systemd (bsc#1196322)
+
+  Calls to %sysusers_create were not updated accordingly.
+
+-------------------------------------------------------------------
+Wed Feb 23 17:46:12 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- spec: fix dependencies for mini variants (follow-up)
+
+  systemd-mini-container is one of the sub-package that relies systemd-mini to
+  conflict with kiwi and to not be installed on real systems.
+
 -------------------------------------------------------------------
 Tue Feb 22 15:22:16 UTC 2022 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -388,10 +388,8 @@ Provides:       nss-mymachines = %{version}-%{release}
 Provides:       systemd-container = %{version}-%{release}
 Provides:       systemd:%{_bindir}/systemd-nspawn
 %if 0%{?bootstrap}
-Conflicts:      kiwi
 Conflicts:      systemd-container
 Provides:       systemd-container = %{version}-%{release}
-Requires:       this-is-only-for-build-envs
 %endif
 
 %description container
@@ -951,7 +949,9 @@ pam-config --add --systemd || :
 # systemd-sysusers is not available in %pre so this needs to be done
 # in %%post. However this shouldn't be an issue since all files the
 # main package ships are owned by root.
-%sysusers_create systemd.conf
+%sysusers_create systemd-journal.conf
+%sysusers_create systemd-network.conf
+%sysusers_create systemd-timesync.conf
 
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
@@ -1171,6 +1171,7 @@ fi
 %endif
 %if %{with resolved}
 %ldconfig
+%sysusers_create systemd-resolve.conf
 %service_add_post systemd-resolved.service
 %endif