Hello community,

here is the log from the commit of package systemd for openSUSE:Factory checked 
in at 2018-05-16 11:24:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
 and      /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "systemd"

Wed May 16 11:24:44 2018 rev:279 rq:606982 version:237

Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes     2018-05-11 
11:28:33.983743807 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes        
2018-05-16 11:24:52.840761911 +0200
@@ -1,0 +2,5 @@
+Mon May 14 08:57:44 UTC 2018 - [email protected]
+
+- Slight rewrite of the previous fix
+
+-------------------------------------------------------------------
@@ -5,0 +11,7 @@
+
+-------------------------------------------------------------------
+Mon Apr 23 14:05:37 UTC 2018 - [email protected]
+
+- Move 80-container-v[ez].network in systemd-container sub-package
+
+- Move 80-container-host0.network from udev to systemd
systemd.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.gFW6FQ/_old  2018-05-16 11:24:55.900650747 +0200
+++ /var/tmp/diff_new_pack.gFW6FQ/_new  2018-05-16 11:24:55.900650747 +0200
@@ -687,10 +687,15 @@
 # machine ID in all images.
 if [ $1 -eq 1 ]; then
         touch     %{_sysconfdir}/machine-id
+        chmod 444 %{_sysconfdir}/machine-id
 fi
 
-# check if /etc/machine-id is writeable and change it to readonly 
-[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id
+# /etc/machine-id might have been created writeable incorrectly
+# (boo#1092269).
+if [ -w %{_sysconfdir}/machine-id ]; then
+        echo "/etc/machine-id shouldn't be writable, fixing..."
+        chmod 444 %{_sysconfdir}/machine-id || :
+fi
 
 %if ! 0%{?bootstrap}
 pam-config --add --systemd || :
@@ -1016,15 +1021,17 @@
 %dir %{_sysconfdir}/sysctl.d
 %{_sysctldir}/99-sysctl.conf
 
+%if %{with networkd}
+%dir %{_sysconfdir}/systemd/network
+%{_prefix}/lib/systemd/network/80-container-host0.network
+%endif
+
 %dir %{_sysconfdir}/X11/xinit
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %dir %{_sysconfdir}/systemd
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
-%if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
-%endif
 %dir %{_sysconfdir}/xdg/systemd
 %{_sysconfdir}/xdg/systemd/user
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
@@ -1230,10 +1237,7 @@
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/systemd-udev*.socket
 %dir %{_prefix}/lib/systemd/network
-%{_prefix}/lib/systemd/network/*.link
-%if %{with networkd}
-%{_prefix}/lib/systemd/network/*.network
-%endif
+%{_prefix}/lib/systemd/network/99-default.link
 %{_datadir}/pkgconfig/udev.pc
 
 %files -n libsystemd0%{?mini}
@@ -1273,6 +1277,10 @@
 %{_bindir}/systemd-nspawn
 %{_unitdir}/[email protected]
 %{_tmpfilesdir}/systemd-nspawn.conf
+%if %{with networkd}
+%{_prefix}/lib/systemd/network/80-container-ve.network
+%{_prefix}/lib/systemd/network/80-container-vz.network
+%endif
 %if %{with machined}
 %{_bindir}/machinectl
 %{_prefix}/lib/systemd/systemd-machined

++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.gFW6FQ/_old  2018-05-16 11:24:55.940649294 +0200
+++ /var/tmp/diff_new_pack.gFW6FQ/_new  2018-05-16 11:24:55.944649148 +0200
@@ -685,10 +685,15 @@
 # machine ID in all images.
 if [ $1 -eq 1 ]; then
         touch     %{_sysconfdir}/machine-id
+        chmod 444 %{_sysconfdir}/machine-id
 fi
 
-# check if /etc/machine-id is writeable and change it to readonly 
-[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id
+# /etc/machine-id might have been created writeable incorrectly
+# (boo#1092269).
+if [ -w %{_sysconfdir}/machine-id ]; then
+        echo "/etc/machine-id shouldn't be writable, fixing..."
+        chmod 444 %{_sysconfdir}/machine-id || :
+fi
 
 %if ! 0%{?bootstrap}
 pam-config --add --systemd || :
@@ -1014,15 +1019,17 @@
 %dir %{_sysconfdir}/sysctl.d
 %{_sysctldir}/99-sysctl.conf
 
+%if %{with networkd}
+%dir %{_sysconfdir}/systemd/network
+%{_prefix}/lib/systemd/network/80-container-host0.network
+%endif
+
 %dir %{_sysconfdir}/X11/xinit
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %dir %{_sysconfdir}/systemd
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
-%if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
-%endif
 %dir %{_sysconfdir}/xdg/systemd
 %{_sysconfdir}/xdg/systemd/user
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
@@ -1228,10 +1235,7 @@
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/systemd-udev*.socket
 %dir %{_prefix}/lib/systemd/network
-%{_prefix}/lib/systemd/network/*.link
-%if %{with networkd}
-%{_prefix}/lib/systemd/network/*.network
-%endif
+%{_prefix}/lib/systemd/network/99-default.link
 %{_datadir}/pkgconfig/udev.pc
 
 %files -n libsystemd0%{?mini}
@@ -1271,6 +1275,10 @@
 %{_bindir}/systemd-nspawn
 %{_unitdir}/[email protected]
 %{_tmpfilesdir}/systemd-nspawn.conf
+%if %{with networkd}
+%{_prefix}/lib/systemd/network/80-container-ve.network
+%{_prefix}/lib/systemd/network/80-container-vz.network
+%endif
 %if %{with machined}
 %{_bindir}/machinectl
 %{_prefix}/lib/systemd/systemd-machined


Reply via email to