Accepting request 653865 from Base:System

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

systemd-mini.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Dec  4 13:20:48 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Import commit 8ae56af7802ef8f91fac64fa244d62a4468fbbd5
+
+  4474878178 udev-builtin-kmod: adjust logging
+  805534aff5 core: use the generic module_load() function
+  ac7e902530 shared/module-util: fix preexisting mixup with errno sign
+  415aa40793 udev-builtin-kmod: use the generic module_load() function
+  8a36b4bac6 Move module-util.h to src/shared/ and load_module() to libshared
+  999b910752 core/kmod-setup: restore comments
+  1f2b822a21 logind: stop managing VT switches if no sessions are registered on that VT
+  5ad8d374c5 terminal-util: introduce vt_release() helper
+  145d492490 logind: become the controlling terminal process before restoring VT (bsc#1101591)
+  d4b5dbc033 terminal-util: introduce vt_restore() helper
+  2e8af185f0 logind: make session_restore_vt() static
+  ff3048364f udev: downgrade message when we fail to set inotify watch up (bsc#1005023)
+
+-------------------------------------------------------------------
+Fri Nov 23 13:30:03 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Fix the test for figuring out if /etc/machine-id is writable in %post (bsc#1117063)
+
+  "test -w" always returns true for root user even if the writable
+  mode bits are not set. Fix this by testing the file mode bit value
+  instead.
+
+-------------------------------------------------------------------
+Fri Nov 23 11:50:19 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Move systemd-sysv-convert from /usr/sbin to /usr/lib/systemd
+
+  This tool is not supposed to be run by users.
+
 -------------------------------------------------------------------
 Fri Nov 16 10:31:42 UTC 2018 - 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.125.g69f9f79e1
+%define suse_version +suse.138.g8ae56af78
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -510,7 +510,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd
 mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert
 mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated
 
-install -m0755 -D %{S:3}  %{buildroot}/%{_sbindir}/systemd-sysv-convert
+install -m0755 -D %{S:3}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert
 install -m0755 -D %{S:4}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
 %endif
 
@@ -699,9 +699,9 @@ fi
 
 # /etc/machine-id might have been created writeable incorrectly
 # (boo#1092269).
-if [ -w %{_sysconfdir}/machine-id ]; then
+if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then
-        echo "/etc/machine-id shouldn't be writable, fixing..."
+        echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..."
-        chmod 444 %{_sysconfdir}/machine-id || :
+        chmod 444 %{_sysconfdir}/machine-id
 fi
 
 %if ! 0%{?bootstrap}
@@ -921,9 +921,6 @@ fi
 %{_bindir}/systemd-stdio-bridge
 %{_bindir}/systemd-detect-virt
 %{_bindir}/timedatectl
-%if %{with sysvcompat}
-%{_sbindir}/systemd-sysv-convert
-%endif
 %{_bindir}/systemd-cgls
 %{_bindir}/systemd-cgtop
 %{_bindir}/systemd-cat

systemd-v239+suse.125.g69f9f79e1.tar.xz

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

systemd-v239+suse.138.g8ae56af78.tar.xz

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

systemd.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Dec  4 13:20:48 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Import commit 8ae56af7802ef8f91fac64fa244d62a4468fbbd5
+
+  4474878178 udev-builtin-kmod: adjust logging
+  805534aff5 core: use the generic module_load() function
+  ac7e902530 shared/module-util: fix preexisting mixup with errno sign
+  415aa40793 udev-builtin-kmod: use the generic module_load() function
+  8a36b4bac6 Move module-util.h to src/shared/ and load_module() to libshared
+  999b910752 core/kmod-setup: restore comments
+  1f2b822a21 logind: stop managing VT switches if no sessions are registered on that VT
+  5ad8d374c5 terminal-util: introduce vt_release() helper
+  145d492490 logind: become the controlling terminal process before restoring VT (bsc#1101591)
+  d4b5dbc033 terminal-util: introduce vt_restore() helper
+  2e8af185f0 logind: make session_restore_vt() static
+  ff3048364f udev: downgrade message when we fail to set inotify watch up (bsc#1005023)
+
+-------------------------------------------------------------------
+Fri Nov 23 13:30:03 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Fix the test for figuring out if /etc/machine-id is writable in %post (bsc#1117063)
+
+  "test -w" always returns true for root user even if the writable
+  mode bits are not set. Fix this by testing the file mode bit value
+  instead.
+
+-------------------------------------------------------------------
+Fri Nov 23 11:50:19 UTC 2018 - Franck Bui <fbui@suse.com>
+
+- Move systemd-sysv-convert from /usr/sbin to /usr/lib/systemd
+
+  This tool is not supposed to be run by users.
+
 -------------------------------------------------------------------
 Fri Nov 16 10:31:42 UTC 2018 - 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.125.g69f9f79e1
+%define suse_version +suse.138.g8ae56af78
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -508,7 +508,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd
 mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert
 mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated
 
-install -m0755 -D %{S:3}  %{buildroot}/%{_sbindir}/systemd-sysv-convert
+install -m0755 -D %{S:3}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert
 install -m0755 -D %{S:4}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
 %endif
 
@@ -697,9 +697,9 @@ fi
 
 # /etc/machine-id might have been created writeable incorrectly
 # (boo#1092269).
-if [ -w %{_sysconfdir}/machine-id ]; then
+if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then
-        echo "/etc/machine-id shouldn't be writable, fixing..."
+        echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..."
-        chmod 444 %{_sysconfdir}/machine-id || :
+        chmod 444 %{_sysconfdir}/machine-id
 fi
 
 %if ! 0%{?bootstrap}
@@ -919,9 +919,6 @@ fi
 %{_bindir}/systemd-stdio-bridge
 %{_bindir}/systemd-detect-virt
 %{_bindir}/timedatectl
-%if %{with sysvcompat}
-%{_sbindir}/systemd-sysv-convert
-%endif
 %{_bindir}/systemd-cgls
 %{_bindir}/systemd-cgtop
 %{_bindir}/systemd-cat