Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2017-09-29 11:49:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Fri Sep 29 11:49:48 2017 rev:262 rq:528802 version:234 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2017-09-17 22:36:38.786846400 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2017-09-29 11:49:54.385167280 +0200 @@ -1,0 +2,26 @@ +Tue Sep 26 10:14:22 UTC 2017 - [email protected] + +- Import commit 9e0985dc330b1cf04bc44049962343bdf4ba851a + + 4fd7cd041 pam_logind: skip leading /dev/ from PAM_TTY field before passing it on + dd6312828 logind: make sure we don't process the same method call twice (#6583) + +------------------------------------------------------------------- +Tue Sep 26 09:27:12 UTC 2017 - [email protected] + +- Update scripts-systemd-upgrade-from-pre-210.sh script + + - drop dependency on awk + - fallback to runlevel #3 if something goes wrong + + Note: I'm not sure how this is supposed to work as /etc/inittab is + likely to be missing in my understanding. Indeed this file is part + of the aaa_base package which might be upgraded before systemd is + installed... + +------------------------------------------------------------------- +Tue Sep 26 08:08:22 UTC 2017 - [email protected] + +- Drop macros.systemd.upstream as it's not used + +------------------------------------------------------------------- systemd.changes: same change Old: ---- macros.systemd.upstream ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.WvXdtp/_old 2017-09-29 11:49:55.529005978 +0200 +++ /var/tmp/diff_new_pack.WvXdtp/_new 2017-09-29 11:49:55.533005414 +0200 @@ -128,7 +128,6 @@ Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 %endif -Requires(post): /usr/bin/awk %if 0%{?bootstrap} Conflicts: systemd @@ -147,7 +146,6 @@ Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 -Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.WvXdtp/_old 2017-09-29 11:49:55.569000338 +0200 +++ /var/tmp/diff_new_pack.WvXdtp/_new 2017-09-29 11:49:55.572999774 +0200 @@ -126,7 +126,6 @@ Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 %endif -Requires(post): /usr/bin/awk %if 0%{?bootstrap} Conflicts: systemd @@ -145,7 +144,6 @@ Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 -Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy ++++++ scripts-systemd-upgrade-from-pre-210.sh ++++++ --- /var/tmp/diff_new_pack.WvXdtp/_old 2017-09-29 11:49:55.692982854 +0200 +++ /var/tmp/diff_new_pack.WvXdtp/_new 2017-09-29 11:49:55.692982854 +0200 @@ -8,12 +8,18 @@ # All hacks can potentially break the admin settings since they work # in /etc... -# Try to read default runlevel from the old inittab if it exists +# Try to read default runlevel from the old inittab if it exists. If +# it fails fallback to runlevel 3 which should still be better than +# the rescue shell. +# +# Note: /etc/inittab was part of the aaa_base package which can be +# upgraded before systemd is. Therefore this file is likely to be +# missing. if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then - runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - if [ -n "$runlevel" ] ; then - ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target - fi + runlevel=$(sed -n -r "s/^id:([[:digit:]]):initdefault:/\1/p" /etc/inittab) + : ${runlevel:=3} + echo "Initializing default.target to runlevel${runlevel}.target" + ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target fi # since v207 /etc/sysctl.conf is no longer parsed, however ++++++ systemd-234.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-234/src/login/logind-session-dbus.c new/systemd-234/src/login/logind-session-dbus.c --- old/systemd-234/src/login/logind-session-dbus.c 2017-09-14 18:32:58.000000000 +0200 +++ new/systemd-234/src/login/logind-session-dbus.c 2017-09-26 12:13:06.000000000 +0200 @@ -457,7 +457,7 @@ goto error; session_save(s); - return 0; + return 1; error: session_device_free(sd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-234/src/login/pam_systemd.c new/systemd-234/src/login/pam_systemd.c --- old/systemd-234/src/login/pam_systemd.c 2017-09-14 18:32:58.000000000 +0200 +++ new/systemd-234/src/login/pam_systemd.c 2017-09-26 12:13:06.000000000 +0200 @@ -45,6 +45,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" +#include "path-util.h" static int parse_argv( pam_handle_t *handle, @@ -334,7 +335,9 @@ type ="tty"; class = "user"; tty = NULL; - } + } else + /* Chop off leading /dev prefix that some clients specify, but others do not. */ + tty = path_startswith(tty, "/dev/") ? : tty; /* If this fails vtnr will be 0, that's intended */ if (!isempty(cvtnr))
