Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2017-09-04 12:20:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Mon Sep 4 12:20:42 2017 rev:260 rq:519864 version:234 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2017-07-29 08:54:41.673733540 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2017-09-04 12:20:46.186712146 +0200 @@ -1,0 +2,27 @@ +Wed Aug 30 15:17:24 UTC 2017 - [email protected] + +- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605) + + It's a temporary but urgent fix for a regression discovered in bug + 1048605. The fix is still under discussion with upstream but we need + to make progress here and limit the number of affected users. + + Consequently this fix reintroduces bsc#1004995 (the bug report has + been re-opened) but this one is far less critical and a workaround + was provided. + + The final solution will fix both bugs. + +------------------------------------------------------------------- +Tue Aug 29 10:30:00 UTC 2017 - [email protected] + +- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 + + 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) + +------------------------------------------------------------------- +Tue Aug 1 13:39:41 UTC 2017 - [email protected] + +- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.uFMxLv/_old 2017-09-04 12:20:47.642507483 +0200 +++ /var/tmp/diff_new_pack.uFMxLv/_new 2017-09-04 12:20:47.650506358 +0200 @@ -162,6 +162,7 @@ # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch +Patch2: 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -765,8 +766,6 @@ end %pre -n udev%{?mini} -%regenerate_initrd_post - if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then rm /usr/lib/udev mv /lib/udev /usr/lib @@ -784,6 +783,7 @@ fi %post -n udev%{?mini} +%regenerate_initrd_post %udev_hwdb_update # add KERNEL name match to existing persistent net rules systemd.spec: same change ++++++ 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch ++++++ >From 02a4361a931a210b547795a49d062e90d2462cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <[email protected]> Date: Wed, 23 Aug 2017 15:18:19 +0200 Subject: [PATCH 1/1] Revert "core/device: Use JobRunningTimeoutSec= for device units" This reverts commit d9732d78034cd01a75f2cda6ebaddb4c3a0929ea. This is not backwards compatible for outer callers that are used to set JobTimeoutSec= for devices. The compatibility breaks if JobTimeoutSec= is longer than default JobRunningTimeoutSec=90, especially JobTimeoutSec=infinity. [mkoutny: fixes bsc#1048605] [fbui: as a consequence, reintroduces bsc#1004995] --- src/core/device.c | 2 +- src/shared/generator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/device.c b/src/core/device.c index 434a6a9c5..89549f43b 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -114,7 +114,7 @@ static void device_init(Unit *u) { * indefinitely for plugged in devices, something which cannot * happen for the other units since their operations time out * anyway. */ - u->job_running_timeout = u->manager->default_timeout_start_usec; + u->job_timeout = u->manager->default_timeout_start_usec; u->ignore_on_isolate = true; } diff --git a/src/shared/generator.c b/src/shared/generator.c index 47be354ba..743bc88f6 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -187,7 +187,7 @@ int generator_write_timeouts( return write_drop_in_format(dir, unit, 50, "device-timeout", "# Automatically generated by %s\n\n" - "[Unit]\nJobRunningTimeoutSec=%s", + "[Unit]\nJobTimeoutSec=%s", program_invocation_short_name, timeout); } -- 2.13.1 ++++++ systemd-234.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-234/rules/61-persistent-storage-compat.rules new/systemd-234/rules/61-persistent-storage-compat.rules --- old/systemd-234/rules/61-persistent-storage-compat.rules 2017-07-28 16:22:18.000000000 +0200 +++ new/systemd-234/rules/61-persistent-storage-compat.rules 2017-08-29 12:17:45.000000000 +0200 @@ -19,9 +19,6 @@ # ignore partitions that span the entire disk TEST=="whole_disk", GOTO="persistent_storage_end" -# for partitions import parent information -ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" - # # Systems without the compat-symlinks-generation file are systems # installed before compat rules were created. They might be using
