From d7c0ec82896ae2dcb91ae39df9fe607d82ce28cea1432ad4f23755092fcf4d50 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Feb 2017 12:33:13 +0000 Subject: [PATCH 01/10] Accepting request 459215 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/459215 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=249 --- systemd-232.tar.xz | 4 ++-- systemd-mini-rpmlintrc | 1 + systemd-mini.changes | 51 ++++++++++++++++++++++++++++++++++++++++++ systemd-mini.spec | 24 ++++++++------------ systemd-rpmlintrc | 1 + systemd.changes | 51 ++++++++++++++++++++++++++++++++++++++++++ systemd.spec | 24 ++++++++------------ 7 files changed, 124 insertions(+), 32 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index 04c9ac5d..c5917f5e 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc6ee1dab9013b879e3ae500b79875651c4462e23a9b9fbeab06597828ee00a3 -size 3211676 +oid sha256:ce282eea299d1e50f206a96e8f860f45c44e0a08c6ab8356582775f924d2d795 +size 3211444 diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index 5b7980e5..a2cefb37 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -19,6 +19,7 @@ addFilter("libudev-mini.*shlib-policy-name-error.*") addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") +addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") diff --git a/systemd-mini.changes b/systemd-mini.changes index b7ed294e..f0f16403 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com + +- Don't ship systemd-resolved for now (bsc#1024897) + + If resolved is enabled , systemd-tmpfiles creates a wrong symlink in + /etc/resolv.conf which confuses the network manager actually used. + +------------------------------------------------------------------- +Thu Feb 9 14:06:46 UTC 2017 - fbui@suse.com + +- More indentation cleanup (no functional changes) + +------------------------------------------------------------------- +Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de + +- Remove obsolete insserv requirements for udev again [bsc#999841] + +------------------------------------------------------------------- +Mon Feb 6 14:13:00 UTC 2017 - fbui@suse.com + +- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc + + e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460) + c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094) + 7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712) + +------------------------------------------------------------------- +Fri Feb 3 08:37:22 UTC 2017 - fbui@suse.com + +- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes) + + Move that part after the fix on timer timestamp files otherwise the + comment doesn't make sense. + +------------------------------------------------------------------- +Wed Feb 1 15:06:06 UTC 2017 - fbui@suse.com + +- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c + + cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice + ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748) + +------------------------------------------------------------------- +Wed Feb 1 14:32:28 UTC 2017 - fbui@suse.com + +- Ship systemd-resolved but it's disabled by default (bsc#1018387) + + The NSS plugin will also be disabled, users need to enable it + manually. + ------------------------------------------------------------------- Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index a0b92de5..395e85ee 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -230,7 +230,6 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl -Requires(postun): %insserv_prereq Requires(post): coreutils Requires(postun): coreutils @@ -399,9 +398,6 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -echo "Checking whether upstream rpm macros changed..." -#skipped for now -#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1 # only needed for bootstrap %if 0%{?bootstrap} @@ -543,9 +539,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* # legacy links for f in loginctl journalctl ; do - ln -s $f %{buildroot}%{_bindir}/systemd-$f + ln -s $f %{buildroot}%{_bindir}/systemd-$f %if ! 0%{?bootstrap} - ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 %endif done ln -s /usr/lib/udev %{buildroot}/lib/udev @@ -687,7 +683,7 @@ fi >/dev/null # since v207 /etc/sysctl.conf is no longer parsed, however # backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : + ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : fi # migrate any symlink which may refer to the old path @@ -706,11 +702,6 @@ enabled) ;; *) rm -f %{_prefix}/lib/systemd/system/tmp.mount esac -# Same for user lingering created by logind. -for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do - chmod 0644 $username -done - # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -718,6 +709,11 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do chmod 0644 $stamp done +# Same for user lingering created by logind. +for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do + chmod 0644 $username +done + # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -764,7 +760,7 @@ fi >/dev/null %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") + posix.symlink("/lib/udev", "/usr/lib/udev") end %pre -n udev%{?mini} @@ -797,7 +793,6 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -%insserv_cleanup systemctl daemon-reload || : # On package update: the restart of the socket units will probably # fail as the daemon is most likely running. It's not really an issue @@ -1002,7 +997,6 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 5b7980e5..a2cefb37 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -19,6 +19,7 @@ addFilter("libudev-mini.*shlib-policy-name-error.*") addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") +addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") diff --git a/systemd.changes b/systemd.changes index b7ed294e..f0f16403 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com + +- Don't ship systemd-resolved for now (bsc#1024897) + + If resolved is enabled , systemd-tmpfiles creates a wrong symlink in + /etc/resolv.conf which confuses the network manager actually used. + +------------------------------------------------------------------- +Thu Feb 9 14:06:46 UTC 2017 - fbui@suse.com + +- More indentation cleanup (no functional changes) + +------------------------------------------------------------------- +Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de + +- Remove obsolete insserv requirements for udev again [bsc#999841] + +------------------------------------------------------------------- +Mon Feb 6 14:13:00 UTC 2017 - fbui@suse.com + +- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc + + e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460) + c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094) + 7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712) + +------------------------------------------------------------------- +Fri Feb 3 08:37:22 UTC 2017 - fbui@suse.com + +- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes) + + Move that part after the fix on timer timestamp files otherwise the + comment doesn't make sense. + +------------------------------------------------------------------- +Wed Feb 1 15:06:06 UTC 2017 - fbui@suse.com + +- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c + + cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice + ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748) + +------------------------------------------------------------------- +Wed Feb 1 14:32:28 UTC 2017 - fbui@suse.com + +- Ship systemd-resolved but it's disabled by default (bsc#1018387) + + The NSS plugin will also be disabled, users need to enable it + manually. + ------------------------------------------------------------------- Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index c1a405c6..ec08a56d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -228,7 +228,6 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl -Requires(postun): %insserv_prereq Requires(post): coreutils Requires(postun): coreutils @@ -397,9 +396,6 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -echo "Checking whether upstream rpm macros changed..." -#skipped for now -#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1 # only needed for bootstrap %if 0%{?bootstrap} @@ -541,9 +537,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* # legacy links for f in loginctl journalctl ; do - ln -s $f %{buildroot}%{_bindir}/systemd-$f + ln -s $f %{buildroot}%{_bindir}/systemd-$f %if ! 0%{?bootstrap} - ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 %endif done ln -s /usr/lib/udev %{buildroot}/lib/udev @@ -685,7 +681,7 @@ fi >/dev/null # since v207 /etc/sysctl.conf is no longer parsed, however # backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : + ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : fi # migrate any symlink which may refer to the old path @@ -704,11 +700,6 @@ enabled) ;; *) rm -f %{_prefix}/lib/systemd/system/tmp.mount esac -# Same for user lingering created by logind. -for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do - chmod 0644 $username -done - # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -716,6 +707,11 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do chmod 0644 $stamp done +# Same for user lingering created by logind. +for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do + chmod 0644 $username +done + # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -762,7 +758,7 @@ fi >/dev/null %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") + posix.symlink("/lib/udev", "/usr/lib/udev") end %pre -n udev%{?mini} @@ -795,7 +791,6 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -%insserv_cleanup systemctl daemon-reload || : # On package update: the restart of the socket units will probably # fail as the daemon is most likely running. It's not really an issue @@ -1000,7 +995,6 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh From 0d468cf7eff5e6401d83c0d27d62545f8e016b372f9a4043182a40615fd36311 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Mar 2017 23:38:25 +0000 Subject: [PATCH 02/10] Accepting request 476828 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/476828 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=250 --- systemd-232.tar.xz | 4 ++-- systemd-mini.changes | 11 +++++++++++ systemd.changes | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index c5917f5e..37cf1ebe 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce282eea299d1e50f206a96e8f860f45c44e0a08c6ab8356582775f924d2d795 -size 3211444 +oid sha256:8ddb8408e0853114e70b99718b15e995d44157f722be5dd6d79f5dbb678a7e86 +size 3212144 diff --git a/systemd-mini.changes b/systemd-mini.changes index f0f16403..225e7478 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 3 16:20:34 UTC 2017 - fbui@suse.com + +- Import commit 103259b3226251d06f79ca627f7b0ba0bd49f4bc + + 0ee7890dd automount: if an automount unit is masked, don't react to activation anymore (#5445) + 99865a181 core: make sure to destroy all name watching bus slots when we are kicked off the bus (#5294) (bsc#1006687) + f34234c54 build-sys: add check for gperf lookup function signature (#5055) + 44e39538f sd-event: "when exiting no signal event are pending" is a wrong assertion (#5271) (boo#995936 bsc#1022014) + 471b26807 sd-event: when an event source fails, don't assume the type of it is still set + ------------------------------------------------------------------- Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index f0f16403..225e7478 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 3 16:20:34 UTC 2017 - fbui@suse.com + +- Import commit 103259b3226251d06f79ca627f7b0ba0bd49f4bc + + 0ee7890dd automount: if an automount unit is masked, don't react to activation anymore (#5445) + 99865a181 core: make sure to destroy all name watching bus slots when we are kicked off the bus (#5294) (bsc#1006687) + f34234c54 build-sys: add check for gperf lookup function signature (#5055) + 44e39538f sd-event: "when exiting no signal event are pending" is a wrong assertion (#5271) (boo#995936 bsc#1022014) + 471b26807 sd-event: when an event source fails, don't assume the type of it is still set + ------------------------------------------------------------------- Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com From 149bd462d09ce15ad28e65dcc4018d2b4caf7522d172445ff5734e62c1820bba Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 15 Mar 2017 00:04:11 +0000 Subject: [PATCH 03/10] Accepting request 477902 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/477902 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=251 --- systemd-232.tar.xz | 4 ++-- systemd-mini.changes | 10 ++++++++++ systemd.changes | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index 37cf1ebe..aa6dd56f 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ddb8408e0853114e70b99718b15e995d44157f722be5dd6d79f5dbb678a7e86 -size 3212144 +oid sha256:0b18396fcc866a33113def88f733742525aee7017ae7d3f593c69e7534414150 +size 3212320 diff --git a/systemd-mini.changes b/systemd-mini.changes index 225e7478..aaafd423 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com + +- Import commit 68fc0a749a83d16d4cde8471d5030bc6254ffd96 + + 76d4d05fb udev: fix variable assignment + 473df8cc4 udev-rules: perform whitespace replacement for symlink subst values (bsc#1025886) + d6c3ff647 udev-event: add replace_whitespace param to udev_event_apply_format + 30ad15f7c libudev-util: change util_replace_whitespace to return number of chars in dest + ------------------------------------------------------------------- Fri Mar 3 16:20:34 UTC 2017 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index 225e7478..aaafd423 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com + +- Import commit 68fc0a749a83d16d4cde8471d5030bc6254ffd96 + + 76d4d05fb udev: fix variable assignment + 473df8cc4 udev-rules: perform whitespace replacement for symlink subst values (bsc#1025886) + d6c3ff647 udev-event: add replace_whitespace param to udev_event_apply_format + 30ad15f7c libudev-util: change util_replace_whitespace to return number of chars in dest + ------------------------------------------------------------------- Fri Mar 3 16:20:34 UTC 2017 - fbui@suse.com From 1481556801ac7e862ec77488c1520c208fb417434da5d7793597003e2c24e57e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Mar 2017 13:59:32 +0000 Subject: [PATCH 04/10] Accepting request 479432 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/479432 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=252 --- systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 12 +++++++++++- systemd.changes | 8 ++++++++ systemd.spec | 12 +++++++++++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index aaafd423..c5fb2402 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com + +- Initialize /etc/machine-id during the first boot (bsc#1024740) + + Previously that was done at package installation but it didn't fit + well for appliance builds. + ------------------------------------------------------------------- Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 395e85ee..03d57366 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -646,13 +646,23 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map exit 0 %post +# Make /etc/machine-id an empty file during package installation. On +# the first boot, machine-id is initialized and either committed (if +# /etc/ is writable) or the system/image runs with a transient machine +# ID, that changes on each boot (if the image is read-only). This is +# especially important for appliance builds to avoid an identical +# machine ID in all images. +if [ $1 -eq 1 ]; then + touch %{_sysconfdir}/machine-id + chmod 666 %{_sysconfdir}/machine-id +fi + %sysusers_create /usr/lib/sysusers.d/systemd.conf %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif ldconfig [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : -systemd-machine-id-setup || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update diff --git a/systemd.changes b/systemd.changes index aaafd423..c5fb2402 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com + +- Initialize /etc/machine-id during the first boot (bsc#1024740) + + Previously that was done at package installation but it didn't fit + well for appliance builds. + ------------------------------------------------------------------- Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index ec08a56d..c5f443c7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -644,13 +644,23 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map exit 0 %post +# Make /etc/machine-id an empty file during package installation. On +# the first boot, machine-id is initialized and either committed (if +# /etc/ is writable) or the system/image runs with a transient machine +# ID, that changes on each boot (if the image is read-only). This is +# especially important for appliance builds to avoid an identical +# machine ID in all images. +if [ $1 -eq 1 ]; then + touch %{_sysconfdir}/machine-id + chmod 666 %{_sysconfdir}/machine-id +fi + %sysusers_create /usr/lib/sysusers.d/systemd.conf %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif ldconfig [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : -systemd-machine-id-setup || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update From 1784aea1441697dde205e73ed8fefefc9c56379c9238b2286351bf6aa7292e4c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Apr 2017 07:47:19 +0000 Subject: [PATCH 05/10] Accepting request 487063 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/487063 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=253 --- fix-machines-subvol-for-rollbacks.sh | 23 ++++++++++++++++++++--- systemd-232.tar.xz | 4 ++-- systemd-mini.changes | 17 +++++++++++++++++ systemd.changes | 17 +++++++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/fix-machines-subvol-for-rollbacks.sh b/fix-machines-subvol-for-rollbacks.sh index 7bdf5d2c..a1b0832e 100644 --- a/fix-machines-subvol-for-rollbacks.sh +++ b/fix-machines-subvol-for-rollbacks.sh @@ -57,9 +57,26 @@ on_exit() { } # -# If something is already mounted don't try to fix anything, the -# subvolume has already been created by either mksubvolume(8) or by -# the admin. In the later case we don't want to screw up his setup. +# If there's already an entry in fstab for /var/lib/machines, it +# means that: +# +# - the installer initialized /var/lib/machines correctly (default) +# - we already fixed it +# - the sysadmin added it manually +# +# In any cases we should exit. +# +# Note: we can't simply check if /var/lib/machines has been mounted +# because an update through a chroot might be in progress (see +# bsc#1030290). +# +if mount --fake /var/lib/machines 2>/dev/null; then + exit +fi + +# +# If something is already mounted don't try to fix anything, it's been +# done manually by the sysadmin. # if mountpoint -q /var/lib/machines; then exit diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index aa6dd56f..2d2037f3 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b18396fcc866a33113def88f733742525aee7017ae7d3f593c69e7534414150 -size 3212320 +oid sha256:51c12300bec369cb034266fc885beaefd9460ed04b039b341bc7dc39157aa5f8 +size 3212352 diff --git a/systemd-mini.changes b/systemd-mini.changes index c5fb2402..40d8a095 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com + +- Import commit f0325620d23a247682c629d28883a364e4a7a8c4 + + 327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487) + f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263) + 44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183) + 64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615) + 77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398) + 336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610) + +------------------------------------------------------------------- +Wed Mar 22 13:24:57 UTC 2017 - fbui@suse.com + +- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290) + ------------------------------------------------------------------- Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index c5fb2402..40d8a095 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com + +- Import commit f0325620d23a247682c629d28883a364e4a7a8c4 + + 327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487) + f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263) + 44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183) + 64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615) + 77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398) + 336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610) + +------------------------------------------------------------------- +Wed Mar 22 13:24:57 UTC 2017 - fbui@suse.com + +- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290) + ------------------------------------------------------------------- Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com From 9bef89eb762026fd0f4de7fa28b0cffef58e8a1ef6be3b15c9ae6e35f96045b4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 May 2017 08:45:36 +0000 Subject: [PATCH 06/10] Accepting request 492807 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/492807 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=254 --- systemd-232.tar.xz | 4 +-- systemd-mini.changes | 80 ++++++++++++++++++++++++++++++++++++++++++++ systemd-mini.spec | 55 +++++++----------------------- systemd.changes | 80 ++++++++++++++++++++++++++++++++++++++++++++ systemd.spec | 55 +++++++----------------------- 5 files changed, 186 insertions(+), 88 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index 2d2037f3..345e172d 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51c12300bec369cb034266fc885beaefd9460ed04b039b341bc7dc39157aa5f8 -size 3212352 +oid sha256:81d3fc89d42d3f3f27d898e94ef8e7d6b5b6bae6deccaffc0a778b30f4b7c570 +size 3213256 diff --git a/systemd-mini.changes b/systemd-mini.changes index 40d8a095..ed4231ac 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,83 @@ +------------------------------------------------------------------- +Tue May 2 16:17:08 UTC 2017 - fbui@suse.com + +- Ship /var/log/README + + Unfortunately it's not possible to also ship /etc/init.d/README + because of rpm "sanity" checks that prevent executable in + /etc/init.d + +------------------------------------------------------------------- +Tue May 2 14:33:58 UTC 2017 - fbui@suse.com + +- Drop systemd-{journalctl,loginctl} legacy symlinks. + +------------------------------------------------------------------- +Tue May 2 13:55:31 UTC 2017 - fbui@suse.com + +- Drop %preun section + + Currently the only use of this section is to remove the symlinks + enabling systemd services on package removal. Those symlinks were + initially installed by the systemd package installation but could + have been overriden by the sysadmin later. If so the symlinks + shouldn't be uninstalled. + + Also in a near futur disabling services will install a symlink to + /dev/null. + +------------------------------------------------------------------- +Tue May 2 13:40:12 UTC 2017 - fbui@suse.com + +- Import commit 9e33c2ae69fbb705e8ad143536e419a231e93020 + + 04ef0eab8 importd: support SUSE style checksums supplementary (#5800) + fb601ad9a importd: support SUSE style checksums (#5206) (fate#322054) + b76b27c76 hwdb: fix warning "atkbd serio0: Unknown key pressed" (#5772) (boo#1010220) + cb0d991f6 loginctl: fix typo causing ignoring multiple session IDs (#5732) + +------------------------------------------------------------------- +Tue May 2 13:37:44 UTC 2017 - fbui@suse.com + +- Make use of %systemd_postun() + +------------------------------------------------------------------- +Tue May 2 13:28:17 UTC 2017 - fbui@suse.com + +- Restart a couple of systemd services on package update + + Those services (most notably journald) should support restarting + these days. However logind still doesn't but that should be fixed + pretty soon, well I hope :) + +------------------------------------------------------------------- +Tue May 2 13:13:25 UTC 2017 - fbui@suse.com + +- Don't buildrequire pam-config, it's not used at this step. + + Also drop the use of it in %postun as it can't realistically + happen... + +------------------------------------------------------------------- +Thu Apr 20 09:26:21 UTC 2017 - fbui@suse.com + +- Don't call /sbin/ldconfig in %post of the main package + + systemd main package doesn't ship any shared libs so there's no + point in calling ldconfig in %post/%postun + +------------------------------------------------------------------- +Thu Apr 20 09:20:03 UTC 2017 - fbui@suse.com + +- Silent %tmpfiles_create in %post (bsc#1034938) + + Due to bsc#1024740, we stopped generating /etc/machine-id during + systemd package installation making the specifier '%m' unavailable + in the tmpfiles.d configuration files at this time. + + Make it simple for now and silent %tmpfiles_create, after all that's + how the macro was implemented originally. + ------------------------------------------------------------------- Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 03d57366..be8414b7 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -76,7 +76,6 @@ BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: pam-config >= 0.79-5 BuildRequires: pam-devel # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. @@ -117,7 +116,6 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 -Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools @@ -523,11 +521,9 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf -# remove README file for now +# Remove README file in init.d as (SUSE) rpm requires executable files +# in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -%if 0%{?bootstrap} -rm -f %{buildroot}%{_localstatedir}/log/README -%endif # journal-upload is built if libcurl is installed which can happen # when importd is enabled (whereas journal_remote is not). @@ -537,13 +533,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* %endif -# legacy links -for f in loginctl journalctl ; do - ln -s $f %{buildroot}%{_bindir}/systemd-$f -%if ! 0%{?bootstrap} - ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 -%endif -done +# legacy link ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal @@ -661,12 +651,11 @@ fi %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif -ldconfig [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update -%tmpfiles_create +%tmpfiles_create 2>/dev/null # Try to read default runlevel from the old inittab if it exists if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then @@ -744,29 +733,12 @@ if [ $1 -gt 1 ]; then fi %postun -ldconfig -if [ $1 -ge 1 ]; then - systemctl daemon-reload || : - # Avoid restarting logind [bnc#934901] until fixed upstream - #systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : -fi -%if ! 0%{?bootstrap} -if [ $1 -eq 0 ]; then - pam-config -d --systemd || : -fi -%endif - -%preun -if [ $1 -eq 0 ]; then - systemctl disable remote-fs.target || : - systemctl disable getty@.service || : - systemctl disable systemd-networkd.service || : - systemctl disable systemd-networkd-wait-online.service || : - systemctl disable systemd-timesyncd.service || : - systemctl disable systemd-resolved.service || : - - rm -f /etc/systemd/system/default.target -fi >/dev/null +%systemd_postun +# Avoid restarting logind until fixed upstream (issue #1163) +%systemd_postun_with_restart systemd-journald.service +%systemd_postun_with_restart systemd-networkd.service +%systemd_postun_with_restart systemd-timesyncd.service +%systemd_postun_with_restart systemd-resolved.service %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then @@ -899,11 +871,9 @@ fi %{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run -%{_bindir}/systemd-journalctl %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl -%{_bindir}/systemd-loginctl %{_bindir}/systemd-inhibit %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles @@ -1122,6 +1092,7 @@ fi %{_mandir}/man8/systemd-u[ps]* %endif %{_docdir}/systemd + %{_prefix}/lib/udev/rules.d/70-uaccess.rules %{_prefix}/lib/udev/rules.d/71-seat.rules %{_prefix}/lib/udev/rules.d/73-seat-late.rules @@ -1241,9 +1212,7 @@ fi %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ -%if %{with sysvcompat} -%{_localstatedir}/log/README -%endif +%doc %{_localstatedir}/log/README %files -n nss-myhostname %defattr(-, root, root) diff --git a/systemd.changes b/systemd.changes index 40d8a095..ed4231ac 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,83 @@ +------------------------------------------------------------------- +Tue May 2 16:17:08 UTC 2017 - fbui@suse.com + +- Ship /var/log/README + + Unfortunately it's not possible to also ship /etc/init.d/README + because of rpm "sanity" checks that prevent executable in + /etc/init.d + +------------------------------------------------------------------- +Tue May 2 14:33:58 UTC 2017 - fbui@suse.com + +- Drop systemd-{journalctl,loginctl} legacy symlinks. + +------------------------------------------------------------------- +Tue May 2 13:55:31 UTC 2017 - fbui@suse.com + +- Drop %preun section + + Currently the only use of this section is to remove the symlinks + enabling systemd services on package removal. Those symlinks were + initially installed by the systemd package installation but could + have been overriden by the sysadmin later. If so the symlinks + shouldn't be uninstalled. + + Also in a near futur disabling services will install a symlink to + /dev/null. + +------------------------------------------------------------------- +Tue May 2 13:40:12 UTC 2017 - fbui@suse.com + +- Import commit 9e33c2ae69fbb705e8ad143536e419a231e93020 + + 04ef0eab8 importd: support SUSE style checksums supplementary (#5800) + fb601ad9a importd: support SUSE style checksums (#5206) (fate#322054) + b76b27c76 hwdb: fix warning "atkbd serio0: Unknown key pressed" (#5772) (boo#1010220) + cb0d991f6 loginctl: fix typo causing ignoring multiple session IDs (#5732) + +------------------------------------------------------------------- +Tue May 2 13:37:44 UTC 2017 - fbui@suse.com + +- Make use of %systemd_postun() + +------------------------------------------------------------------- +Tue May 2 13:28:17 UTC 2017 - fbui@suse.com + +- Restart a couple of systemd services on package update + + Those services (most notably journald) should support restarting + these days. However logind still doesn't but that should be fixed + pretty soon, well I hope :) + +------------------------------------------------------------------- +Tue May 2 13:13:25 UTC 2017 - fbui@suse.com + +- Don't buildrequire pam-config, it's not used at this step. + + Also drop the use of it in %postun as it can't realistically + happen... + +------------------------------------------------------------------- +Thu Apr 20 09:26:21 UTC 2017 - fbui@suse.com + +- Don't call /sbin/ldconfig in %post of the main package + + systemd main package doesn't ship any shared libs so there's no + point in calling ldconfig in %post/%postun + +------------------------------------------------------------------- +Thu Apr 20 09:20:03 UTC 2017 - fbui@suse.com + +- Silent %tmpfiles_create in %post (bsc#1034938) + + Due to bsc#1024740, we stopped generating /etc/machine-id during + systemd package installation making the specifier '%m' unavailable + in the tmpfiles.d configuration files at this time. + + Make it simple for now and silent %tmpfiles_create, after all that's + how the macro was implemented originally. + ------------------------------------------------------------------- Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index c5f443c7..ecb0ea33 100644 --- a/systemd.spec +++ b/systemd.spec @@ -74,7 +74,6 @@ BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: pam-config >= 0.79-5 BuildRequires: pam-devel # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. @@ -115,7 +114,6 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 -Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools @@ -521,11 +519,9 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf -# remove README file for now +# Remove README file in init.d as (SUSE) rpm requires executable files +# in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -%if 0%{?bootstrap} -rm -f %{buildroot}%{_localstatedir}/log/README -%endif # journal-upload is built if libcurl is installed which can happen # when importd is enabled (whereas journal_remote is not). @@ -535,13 +531,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* %endif -# legacy links -for f in loginctl journalctl ; do - ln -s $f %{buildroot}%{_bindir}/systemd-$f -%if ! 0%{?bootstrap} - ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 -%endif -done +# legacy link ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal @@ -659,12 +649,11 @@ fi %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif -ldconfig [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update -%tmpfiles_create +%tmpfiles_create 2>/dev/null # Try to read default runlevel from the old inittab if it exists if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then @@ -742,29 +731,12 @@ if [ $1 -gt 1 ]; then fi %postun -ldconfig -if [ $1 -ge 1 ]; then - systemctl daemon-reload || : - # Avoid restarting logind [bnc#934901] until fixed upstream - #systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : -fi -%if ! 0%{?bootstrap} -if [ $1 -eq 0 ]; then - pam-config -d --systemd || : -fi -%endif - -%preun -if [ $1 -eq 0 ]; then - systemctl disable remote-fs.target || : - systemctl disable getty@.service || : - systemctl disable systemd-networkd.service || : - systemctl disable systemd-networkd-wait-online.service || : - systemctl disable systemd-timesyncd.service || : - systemctl disable systemd-resolved.service || : - - rm -f /etc/systemd/system/default.target -fi >/dev/null +%systemd_postun +# Avoid restarting logind until fixed upstream (issue #1163) +%systemd_postun_with_restart systemd-journald.service +%systemd_postun_with_restart systemd-networkd.service +%systemd_postun_with_restart systemd-timesyncd.service +%systemd_postun_with_restart systemd-resolved.service %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then @@ -897,11 +869,9 @@ fi %{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run -%{_bindir}/systemd-journalctl %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl -%{_bindir}/systemd-loginctl %{_bindir}/systemd-inhibit %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles @@ -1120,6 +1090,7 @@ fi %{_mandir}/man8/systemd-u[ps]* %endif %{_docdir}/systemd + %{_prefix}/lib/udev/rules.d/70-uaccess.rules %{_prefix}/lib/udev/rules.d/71-seat.rules %{_prefix}/lib/udev/rules.d/73-seat-late.rules @@ -1239,9 +1210,7 @@ fi %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ -%if %{with sysvcompat} -%{_localstatedir}/log/README -%endif +%doc %{_localstatedir}/log/README %files -n nss-myhostname %defattr(-, root, root) From 9dc0c1c53308e0d04cf3902e198ce9b1f15c98383901e8b07fcd433b3d289c8d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 20 Jun 2017 07:33:30 +0000 Subject: [PATCH 07/10] Accepting request 504040 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/504040 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=255 --- systemd-232.tar.xz | 3 - systemd-233.tar.xz | 3 + systemd-mini.changes | 65 +++++++++++++++++++++ systemd-mini.spec | 31 +++++++++- systemd-sysv-convert | 132 ++++++++++++++++++++++++------------------- systemd-user | 9 +++ systemd.changes | 65 +++++++++++++++++++++ systemd.spec | 31 +++++++++- 8 files changed, 272 insertions(+), 67 deletions(-) delete mode 100644 systemd-232.tar.xz create mode 100644 systemd-233.tar.xz create mode 100644 systemd-user diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz deleted file mode 100644 index 345e172d..00000000 --- a/systemd-232.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81d3fc89d42d3f3f27d898e94ef8e7d6b5b6bae6deccaffc0a778b30f4b7c570 -size 3213256 diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz new file mode 100644 index 00000000..15902cbf --- /dev/null +++ b/systemd-233.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68abe8a1ad8d19c64f4e10fdee7b8aceebc7d49fc2bb2711408171bdc841e67a +size 3255548 diff --git a/systemd-mini.changes b/systemd-mini.changes index ed4231ac..ffafade9 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com + +- Make sure "lock" group is created + + On SUSE distros, /run/lock must be owned by "lock" group (see + boo#733523). + + This group was previously created by another package but since a + recent changes it doesn't seem to be true anymore or at least this + package isn't pulled in anymore when building the rescue system. + + For now make systemd creates the group by adding + "Requires: group(post)". + + I'm currently not sure why we don't use sysusers.d stuff for that + purpose and if the "lock" group on /run/lock is still + mandatory. This should be revisited later. + +------------------------------------------------------------------- +Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com + +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) + + The new compat rule must be embedded in the initramfs so make sure + that the installed dracut supports it. + +------------------------------------------------------------------- +Wed May 24 11:23:10 UTC 2017 - fbui@suse.com + +- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857) + + - package new systemd-umount binary + - package new environment generator stuff + - drop /dev/root symlink support + - /etc/pam.d/systemd-user is not patched anymore but we ship a + dedicated file for SUSE now. + - manage compat symlink generation in a dedicated branch (bsc#1040153) + +------------------------------------------------------------------- +Wed May 17 15:57:19 UTC 2017 - fbui@suse.com + +- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303) + + The database might be missing when upgrading a package which was + shipping no sysv init scripts nor unit files (at the time --save was + called) but the new version start shipping unit files. + +------------------------------------------------------------------- +Wed May 17 13:14:40 UTC 2017 - fbui@suse.com + +- Fix indentation in systemd-sysv-convert + + While at it, strip trailing whitespaces. + + No functional changes. + +------------------------------------------------------------------- +Thu May 11 08:47:48 UTC 2017 - fbui@suse.com + +- Disable group shadow support (bsc#1029516) + + The new configure option will be imported during the next tarball + update. + ------------------------------------------------------------------- Tue May 2 16:17:08 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index be8414b7..a40555f2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 232 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -121,6 +121,7 @@ Requires: systemd-presets-branding Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 +Requires: group(lock) Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils @@ -142,6 +143,7 @@ Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-%{version}.tar.xz Source1: %{name}-rpmlintrc +Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 @@ -237,6 +239,7 @@ Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 +Conflicts: dracut < 044.1 Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem @@ -433,6 +436,7 @@ systemd_cryptsetup_LDFLAGS =\\\ --disable-lto \ --disable-tests \ --without-kill-user-processes \ + --with-default-hierarchy=hybrid \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -441,6 +445,7 @@ systemd_cryptsetup_LDFLAGS =\\\ --disable-adm-group \ --disable-wheel-group \ --disable-ldconfig \ + --disable-gshadow \ %if %{without networkd} --disable-networkd \ %endif @@ -497,6 +502,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target +# Overwrite /etc/pam.d/systemd-user shipped by upstream with one +# customized for openSUSE distros. +install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ + # We keep a copy of tmp.mount because it may be removed if not used # (see %post): we want to be sure tmpfs won't be used for /tmp by # default on Suse distros. @@ -756,6 +765,14 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# New installations uses the last compat symlink generation number +# (currently at 2), which basically disables all compat symlinks. On +# old systems, the file doesn't exist. This is equivalent to +# generation #1, which enables the creation of all compat symlinks. +if [ $1 -eq 1 ]; then + echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation +fi + # Create "tape"/"input" group which is referenced by some udev rules # that we're shipping. FIXME: maybe we should consider using # "sysusers_create basic.conf" instead ? @@ -869,6 +886,7 @@ fi %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount +%{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/journalctl @@ -921,7 +939,7 @@ fi %{_prefix}/lib/systemd/user/*.service %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so +%{_prefix}/lib/systemd/libsystemd-shared-*.so %{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog @@ -931,6 +949,7 @@ fi %{_prefix}/lib/systemd/user-preset %{_prefix}/lib/systemd/system-generators %{_prefix}/lib/systemd/user-generators +%{_prefix}/lib/systemd/user-environment-generators %dir %{_prefix}/lib/systemd/ntp-units.d/ %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ @@ -961,6 +980,8 @@ fi %{_libexecdir}/tmpfiles.d/ %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%{_libexecdir}/environment.d/ + %dir %{_libexecdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d @@ -1076,6 +1097,9 @@ fi %if %{with importd} %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif +%if %{with networkd} +%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1090,6 +1114,7 @@ fi %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* +%{_mandir}/man8/30-systemd-environment-d-generator.* %endif %{_docdir}/systemd @@ -1157,7 +1182,7 @@ fi %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/remount-tmpfs -%{_prefix}/lib/udev/rootsymlink-generator +%ghost %{_prefix}/lib/udev/compat-symlink-generation %dir %{_prefix}/lib/udev/rules.d/ %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules diff --git a/systemd-sysv-convert b/systemd-sysv-convert index c9f777a6..479c8ba3 100644 --- a/systemd-sysv-convert +++ b/systemd-sysv-convert @@ -9,15 +9,15 @@ declare -A results_runlevel declare -A results_priority usage() { -cat << EOF + cat << EOF usage: systemd-sysv-convert [-h] [--save] [--show] [--apply] SERVICE [SERVICE ...] EOF } help() { -usage -cat << EOF + usage + cat << EOF Save and Restore SysV Service Runlevel Information positional arguments: @@ -33,45 +33,48 @@ EOF } find_service() { -local service -local runlevel -declare -i priority -service=$1 -runlevel=$2 -priority=-1 -for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do - initscript=$(basename $l) - if [ ${initscript:0:1} != "S" -o ${initscript:3} != "$service" ]; then - continue - fi - if [ ${initscript:1:2} -ge 0 -a ${initscript:1:2} -le 99 -a ${initscript:1:2} -ge $priority ]; then - if [ ${initscript:1:1} == 0 ]; then - priority=${initscript:2:1} - else - priority=${initscript:1:2} + local service + local runlevel + declare -i priority + + service=$1 + runlevel=$2 + priority=-1 + + for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do + initscript=$(basename $l) + if [ ${initscript:0:1} != "S" -o ${initscript:3} != "$service" ]; then + continue fi + if [ ${initscript:1:2} -ge 0 -a ${initscript:1:2} -le 99 -a ${initscript:1:2} -ge $priority ]; then + if [ ${initscript:1:1} == 0 ]; then + priority=${initscript:2:1} + else + priority=${initscript:1:2} + fi + fi + done + if [ $priority -ge 0 ]; then + return $priority fi -done -if [ $priority -ge 0 ]; then - return $priority -else return 255 -fi } lookup_database() { -local services -local service -local service_file -local runlevel -local priority -local -i k -declare -a parsed -services=$@ -k=0 -results_runlevel=() -results_priority=() -while read line ; do + local services + local service + local service_file + local runlevel + local priority + local -i k + declare -a parsed + + services=$@ + k=0 + results_runlevel=() + results_priority=() + + while read line ; do k+=1 parsed=($line) service=${parsed[0]} @@ -85,7 +88,7 @@ while read line ; do echo "Priority out of bounds in database line $k. Ignoring" >/dev/stderr continue fi - + declare -i found found=0 for s in $services ; do @@ -99,12 +102,12 @@ while read line ; do fi results_runlevel[$service]+=" $runlevel" results_priority[$service]+=" $priority" -done < /var/lib/systemd/sysv-convert/database + done < /var/lib/systemd/sysv-convert/database } declare -i fail=0 -case "$1" in - -h|--help) +case "$1" in + -h|--help) help exit 0 ;; @@ -112,17 +115,16 @@ case "$1" in shift for service in $@ ; do if [ ! -r "/etc/init.d/$service" ]; then - echo "SysV service $service does not exist" >/dev/stderr - let fail++ + echo "SysV service $service does not exist, skipping" continue fi for runlevel in 2 3 4 5; do find_service $service $runlevel priority=$? if [ $priority -lt 255 ]; then - echo "$service $runlevel $priority" + echo "$service $runlevel $priority" >>/var/lib/systemd/sysv-convert/database fi - done >>/var/lib/systemd/sysv-convert/database + done done ;; --show) @@ -153,23 +155,37 @@ case "$1" in exit 1 fi done - lookup_database $services - for service in $services; do - [ -f "/lib/systemd/system/$service.service" ] && service_file="/lib/systemd/system/$service.service" - [ -f "/usr/lib/systemd/system/$service.service" ] && service_file="/usr/lib/systemd/system/$service.service" - # If $service is not present in the database, - # then it simply means that the sysv init - # service was not enabled at all. - for runlevel in ${results_runlevel[$service]}; do - echo ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service >/dev/stderr - mkdir -p "/etc/systemd/system/runlevel$runlevel.target.wants" - /bin/ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service + # + # The database might no have been created by a previous --save + # call. This can happen when: + # + # - we're upgrading a package which initially didn't + # have any unit file nor sysv init script and now + # start shipping one or more unit files (bsc#982303). + # + # - the sysv init service wasn't enabled at all before + # being migrated to a native unit file (bsc#982211). + # + if [ -e /var/lib/systemd/sysv-convert/database ]; then + lookup_database $services + for service in $services; do + [ -f "/lib/systemd/system/$service.service" ] && service_file="/lib/systemd/system/$service.service" + [ -f "/usr/lib/systemd/system/$service.service" ] && service_file="/usr/lib/systemd/system/$service.service" + + # If $service is not present in the database, + # then it simply means that the sysv init + # service was not enabled at all. + for runlevel in ${results_runlevel[$service]}; do + echo ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service >/dev/stderr + mkdir -p "/etc/systemd/system/runlevel$runlevel.target.wants" + /bin/ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service + done done - - done + fi ;; - *) usage + *) + usage let fail=2 ;; esac diff --git a/systemd-user b/systemd-user new file mode 100644 index 00000000..f1d252b7 --- /dev/null +++ b/systemd-user @@ -0,0 +1,9 @@ +# This file is part of systemd. +# +# Used by systemd --user instances. + +account include common-account + +session required pam_selinux.so close +session required pam_selinux.so nottys open +session include common-session diff --git a/systemd.changes b/systemd.changes index ed4231ac..ffafade9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com + +- Make sure "lock" group is created + + On SUSE distros, /run/lock must be owned by "lock" group (see + boo#733523). + + This group was previously created by another package but since a + recent changes it doesn't seem to be true anymore or at least this + package isn't pulled in anymore when building the rescue system. + + For now make systemd creates the group by adding + "Requires: group(post)". + + I'm currently not sure why we don't use sysusers.d stuff for that + purpose and if the "lock" group on /run/lock is still + mandatory. This should be revisited later. + +------------------------------------------------------------------- +Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com + +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) + + The new compat rule must be embedded in the initramfs so make sure + that the installed dracut supports it. + +------------------------------------------------------------------- +Wed May 24 11:23:10 UTC 2017 - fbui@suse.com + +- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857) + + - package new systemd-umount binary + - package new environment generator stuff + - drop /dev/root symlink support + - /etc/pam.d/systemd-user is not patched anymore but we ship a + dedicated file for SUSE now. + - manage compat symlink generation in a dedicated branch (bsc#1040153) + +------------------------------------------------------------------- +Wed May 17 15:57:19 UTC 2017 - fbui@suse.com + +- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303) + + The database might be missing when upgrading a package which was + shipping no sysv init scripts nor unit files (at the time --save was + called) but the new version start shipping unit files. + +------------------------------------------------------------------- +Wed May 17 13:14:40 UTC 2017 - fbui@suse.com + +- Fix indentation in systemd-sysv-convert + + While at it, strip trailing whitespaces. + + No functional changes. + +------------------------------------------------------------------- +Thu May 11 08:47:48 UTC 2017 - fbui@suse.com + +- Disable group shadow support (bsc#1029516) + + The new configure option will be imported during the next tarball + update. + ------------------------------------------------------------------- Tue May 2 16:17:08 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index ecb0ea33..55318178 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 232 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -119,6 +119,7 @@ Requires: systemd-presets-branding Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 +Requires: group(lock) Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils @@ -140,6 +141,7 @@ Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-%{version}.tar.xz Source1: %{name}-rpmlintrc +Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 @@ -235,6 +237,7 @@ Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 +Conflicts: dracut < 044.1 Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem @@ -431,6 +434,7 @@ systemd_cryptsetup_LDFLAGS =\\\ --disable-lto \ --disable-tests \ --without-kill-user-processes \ + --with-default-hierarchy=hybrid \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -439,6 +443,7 @@ systemd_cryptsetup_LDFLAGS =\\\ --disable-adm-group \ --disable-wheel-group \ --disable-ldconfig \ + --disable-gshadow \ %if %{without networkd} --disable-networkd \ %endif @@ -495,6 +500,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target +# Overwrite /etc/pam.d/systemd-user shipped by upstream with one +# customized for openSUSE distros. +install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ + # We keep a copy of tmp.mount because it may be removed if not used # (see %post): we want to be sure tmpfs won't be used for /tmp by # default on Suse distros. @@ -754,6 +763,14 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# New installations uses the last compat symlink generation number +# (currently at 2), which basically disables all compat symlinks. On +# old systems, the file doesn't exist. This is equivalent to +# generation #1, which enables the creation of all compat symlinks. +if [ $1 -eq 1 ]; then + echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation +fi + # Create "tape"/"input" group which is referenced by some udev rules # that we're shipping. FIXME: maybe we should consider using # "sysusers_create basic.conf" instead ? @@ -867,6 +884,7 @@ fi %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount +%{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/journalctl @@ -919,7 +937,7 @@ fi %{_prefix}/lib/systemd/user/*.service %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so +%{_prefix}/lib/systemd/libsystemd-shared-*.so %{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog @@ -929,6 +947,7 @@ fi %{_prefix}/lib/systemd/user-preset %{_prefix}/lib/systemd/system-generators %{_prefix}/lib/systemd/user-generators +%{_prefix}/lib/systemd/user-environment-generators %dir %{_prefix}/lib/systemd/ntp-units.d/ %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ @@ -959,6 +978,8 @@ fi %{_libexecdir}/tmpfiles.d/ %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%{_libexecdir}/environment.d/ + %dir %{_libexecdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d @@ -1074,6 +1095,9 @@ fi %if %{with importd} %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif +%if %{with networkd} +%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1088,6 +1112,7 @@ fi %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* +%{_mandir}/man8/30-systemd-environment-d-generator.* %endif %{_docdir}/systemd @@ -1155,7 +1180,7 @@ fi %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/remount-tmpfs -%{_prefix}/lib/udev/rootsymlink-generator +%ghost %{_prefix}/lib/udev/compat-symlink-generation %dir %{_prefix}/lib/udev/rules.d/ %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules From 692cc8087f6365a2ef14339552ed80224ca56d49ab1334d8611317cedf5ce829 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 17 Jul 2017 07:07:55 +0000 Subject: [PATCH 08/10] Accepting request 508718 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/508718 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=256 --- ...sion-keyring-per-system-sevice-entir.patch | 31 +++++ systemd-233.tar.xz | 4 +- systemd-mini.changes | 68 ++++++++++- systemd-mini.spec | 36 ++++-- systemd-sysv-convert | 113 +++++------------- systemd.changes | 68 ++++++++++- systemd.spec | 36 ++++-- 7 files changed, 250 insertions(+), 106 deletions(-) create mode 100644 0001-core-disable-session-keyring-per-system-sevice-entir.patch diff --git a/0001-core-disable-session-keyring-per-system-sevice-entir.patch b/0001-core-disable-session-keyring-per-system-sevice-entir.patch new file mode 100644 index 00000000..62580997 --- /dev/null +++ b/0001-core-disable-session-keyring-per-system-sevice-entir.patch @@ -0,0 +1,31 @@ +From 30cceac444bcc67896611154b051669225abaa93 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 6 Jul 2017 15:48:10 +0200 +Subject: [PATCH] core: disable session keyring per system sevice entirely + for now + +It seems that this stuff needs more thoughts... + +See also: +https://github.com/systemd/systemd/pull/6286 + +[fbui: fixes bnc#1045886] +--- + src/core/service.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/service.c b/src/core/service.c +index 74054887b..874f2be93 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -1341,7 +1341,6 @@ static int service_spawn( + } else + path = UNIT(s)->cgroup_path; + +- exec_params.flags |= MANAGER_IS_SYSTEM(UNIT(s)->manager) ? EXEC_NEW_KEYRING : 0; + exec_params.argv = c->argv; + exec_params.environment = final_env; + exec_params.fds = fds; +-- +2.13.1 + diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz index 15902cbf..a77e6941 100644 --- a/systemd-233.tar.xz +++ b/systemd-233.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68abe8a1ad8d19c64f4e10fdee7b8aceebc7d49fc2bb2711408171bdc841e67a -size 3255548 +oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d +size 3257376 diff --git a/systemd-mini.changes b/systemd-mini.changes index ffafade9..cf442750 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de + +- Edit pkgconfig(liblz4) dependency: liblz4 now uses 1.x *again* + +------------------------------------------------------------------- +Thu Jul 6 14:12:34 UTC 2017 - fbui@suse.com + +- Added 0001-core-disable-session-keyring-per-system-sevice-entir.patch (bnc#1045886) + + Temporary patch to disable the session keyring stuff as it's + currently broken and may introduce some security holes. + +------------------------------------------------------------------- +Thu Jul 6 12:57:06 UTC 2017 - fbui@suse.com + +- Import commit 21827ea0875ff197e16e72003b2bfaa1c6e8daad + + 1ad06735f core: fail when syntactically invalid values for User=/Group= fields are detected (bsc#1047023) + d563972e2 timesyncd: don't use compiled-in list if FallbackNTP has been configured explicitly + f4e0c16f5 gpt-auto-generator: fix the handling of the value returned by fstab_has_fstype() in add_swap() (#6280) + e1345aac5 fix add_esp() in the gpt-auto-generator.c (#6251) + c591ece9a automount: don't lstat(2) upon umount request (#6086) (bsc#1040968) + 643ab2eea gpt-auto-generator: disable gpt auto logic for swaps if at least one is defined in fstab + f07d2022f fstab-util: introduce fstab_has_fstype() helper + bf735bb35 fstab-util: don't eat up errors in fstab_is_mount_point() + a4b40fbed resolved: simplify alloc size calculation (bsc#1045290 CVE-2017-9445) + 8b960bec0 only check signature job error if signature job exists (#6118) (boo#1043758) + 1418bfb5b job: Ensure JobRunningTimeoutSec= survives serialization (#6128) (bsc#1004995) + 19b6d5f08 udev: turn off -Wformat-nonliteral for one safe case + 717ace439 udev: net_id add support for platform bus (ACPI, mostly arm64) devices (#5933) + a3bf2e6b5 core/mount: pass "-c" flag to /bin/umount (#6093) + +------------------------------------------------------------------- +Wed Jul 5 07:15:17 UTC 2017 - fbui@suse.com + +- Add minimal support for boot.d/* scripts in systemd-sysv-convert (boo#1046750) + + While at it, the handling of the symlink priorities is also removed + since it doesn't appear to be used at all. + +------------------------------------------------------------------- +Thu Jun 22 15:24:22 UTC 2017 - fbui@suse.com + +- Don't try to restart networkd/resolved if they're disabled (boo#1045521) + + "systemctl try-restart/preset" wants the unit files exist. + +------------------------------------------------------------------- +Thu Jun 22 13:50:46 UTC 2017 - fbui@suse.com + +- Stop shipping /usr/lib/sysusers.d/basic.conf (bsc#1006978) + + Ok looks like the previous change was the right thing to do and we + continue to follow this path by relying on the new user/group scheme + + Therefore the basic system user/group are now managed and created by + system-sysusers and udev also relies on this for the groups it uses + in its rule files. + + Ideally we should have listed all of the groups in the deps (with + "Requires: group(disk)" but the list of the groups is rather long + and the risk for those groups to be re-organized is probably low, so + currently we simply use "Requires: system-group-hardware" as a + shortcut. + ------------------------------------------------------------------- Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com @@ -11,7 +77,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com package isn't pulled in anymore when building the rescue system. For now make systemd creates the group by adding - "Requires: group(post)". + "Requires: group(lock)". I'm currently not sure why we don't use sysusers.d stuff for that purpose and if the "lock" group on /run/lock is still diff --git a/systemd-mini.spec b/systemd-mini.spec index a40555f2..dbb34853 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -83,7 +83,7 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) >= 125 +BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -155,6 +155,14 @@ Source14: kbd-model-map.legacy Source1065: udev-remount-tmpfs +# Patches listed in here are really special cases. Normally all +# changes must go to upstream first and then are cherry-picked in the +# SUSE git repository. But in very few cases, some stuff might be +# broken in upstream and need an urgent fix. Even in this case, the +# 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 + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -225,9 +233,8 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: system-group-hardware Requires(pre): /usr/bin/stat -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl @@ -399,6 +406,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} +%autopatch -p1 # only needed for bootstrap %if 0%{?bootstrap} @@ -530,6 +538,10 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf +# The definition of the basic users/groups are defined by system-user +# on SUSE (bsc#1006978). +rm -f %{buildroot}%{_prefix}/lib/sysusers.d/basic.conf + # Remove README file in init.d as (SUSE) rpm requires executable files # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README @@ -682,10 +694,14 @@ if [ $1 -eq 1 ]; then # unit. systemctl preset remote-fs.target || : systemctl preset getty@.service || : + systemctl preset systemd-timesyncd.service || : +%if %{with networkd} systemctl preset systemd-networkd.service || : systemctl preset systemd-networkd-wait-online.service || : - systemctl preset systemd-timesyncd.service || : +%endif +%if %{with resolved} systemctl preset systemd-resolved.service || : +%endif fi >/dev/null # since v207 /etc/sysctl.conf is no longer parsed, however @@ -745,9 +761,13 @@ fi %systemd_postun # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service -%systemd_postun_with_restart systemd-networkd.service %systemd_postun_with_restart systemd-timesyncd.service +%if %{with networkd} +%systemd_postun_with_restart systemd-networkd.service +%endif +%if %{with resolved} %systemd_postun_with_restart systemd-resolved.service +%endif %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then @@ -773,12 +793,6 @@ if [ $1 -eq 1 ]; then echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation fi -# Create "tape"/"input" group which is referenced by some udev rules -# that we're shipping. FIXME: maybe we should consider using -# "sysusers_create basic.conf" instead ? -getent group tape >/dev/null || groupadd -r tape || : -getent group input >/dev/null || groupadd -r input || : - %post -n udev%{?mini} %udev_hwdb_update diff --git a/systemd-sysv-convert b/systemd-sysv-convert index 479c8ba3..5d07c48d 100644 --- a/systemd-sysv-convert +++ b/systemd-sysv-convert @@ -5,8 +5,7 @@ if [ "$UID" != "0" ]; then exit 1 fi -declare -A results_runlevel -declare -A results_priority +declare -A results_target usage() { cat << EOF @@ -33,75 +32,30 @@ EOF } find_service() { - local service - local runlevel - declare -i priority + local service=$1 + local rcnd=$2 - service=$1 - runlevel=$2 - priority=-1 - - for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do - initscript=$(basename $l) - if [ ${initscript:0:1} != "S" -o ${initscript:3} != "$service" ]; then - continue - fi - if [ ${initscript:1:2} -ge 0 -a ${initscript:1:2} -le 99 -a ${initscript:1:2} -ge $priority ]; then - if [ ${initscript:1:1} == 0 ]; then - priority=${initscript:2:1} - else - priority=${initscript:1:2} - fi - fi - done - if [ $priority -ge 0 ]; then - return $priority - fi - return 255 + case $rcnd in + boot.d) [ -L /etc/rc.d/$rcnd/S??boot.$service ] ;; + *) [ -L /etc/rc.d/$rcnd/S??$service ] + esac } lookup_database() { - local services + local services=$@ local service - local service_file local runlevel local priority - local -i k - declare -a parsed - services=$@ - k=0 - results_runlevel=() - results_priority=() - - while read line ; do - k+=1 - parsed=($line) - service=${parsed[0]} - runlevel=${parsed[1]} - priority=${parsed[2]} - if [ $runlevel -lt 2 -o $runlevel -gt 5 ]; then - echo "Runlevel out of bounds in database line $k. Ignoring" >/dev/stderr - continue - fi - if [ $priority -lt 0 -o $priority -gt 99 ]; then - echo "Priority out of bounds in database line $k. Ignoring" >/dev/stderr - continue - fi - - declare -i found - found=0 + # 'priority' field is not used but is kept for backward compat + # reason. + while read service runlevel priority; do for s in $services ; do if [ $s == $service ]; then - found=1 - continue + results_target[$service]+=" runlevel$runlevel.target" + break fi done - if [ $found -eq 0 ]; then - continue - fi - results_runlevel[$service]+=" $runlevel" - results_priority[$service]+=" $priority" done < /var/lib/systemd/sysv-convert/database } @@ -114,16 +68,19 @@ case "$1" in --save) shift for service in $@ ; do - if [ ! -r "/etc/init.d/$service" ]; then + if [ ! -r /etc/init.d/$service ] && [ ! -r /etc/init.d/boot.$service ]; then echo "SysV service $service does not exist, skipping" continue fi - for runlevel in 2 3 4 5; do - find_service $service $runlevel - priority=$? - if [ $priority -lt 255 ]; then - echo "$service $runlevel $priority" >>/var/lib/systemd/sysv-convert/database - fi + for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do + case $rcnd in + rc*.d) runlevel=${rcnd:2:1} ;; + boot.d) runlevel=3 ;; + esac + + # Write a dumb priority as it is not used. + find_service $service $rcnd && + echo "$service $runlevel 50" >>/var/lib/systemd/sysv-convert/database done done ;; @@ -132,17 +89,13 @@ case "$1" in services=$@ lookup_database $services for service in $services; do - if [ -z "${results_runlevel[$service]}" ]; then - echo No information found about service $service found. >/dev/stderr + if [ -z "${results_target[$service]}" ]; then + echo "No information about service $service found." >/dev/stderr let fail++ continue fi - declare -i count - count=0 - priority=(${results_priority[$service]}) - for runlevel in ${results_runlevel[$service]}; do - echo SysV service $service enabled in runlevel $runlevel at priority ${priority[$count]} - count+=1 + for target in ${results_target[$service]}; do + echo "SysV service '$service' is pulled by $target" done done ;; @@ -170,16 +123,16 @@ case "$1" in if [ -e /var/lib/systemd/sysv-convert/database ]; then lookup_database $services for service in $services; do - [ -f "/lib/systemd/system/$service.service" ] && service_file="/lib/systemd/system/$service.service" - [ -f "/usr/lib/systemd/system/$service.service" ] && service_file="/usr/lib/systemd/system/$service.service" + [ -f "/lib/systemd/system/$service.service" ] && unit="/lib/systemd/system/$service.service" + [ -f "/usr/lib/systemd/system/$service.service" ] && unit="/usr/lib/systemd/system/$service.service" # If $service is not present in the database, # then it simply means that the sysv init # service was not enabled at all. - for runlevel in ${results_runlevel[$service]}; do - echo ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service >/dev/stderr - mkdir -p "/etc/systemd/system/runlevel$runlevel.target.wants" - /bin/ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service + for target in ${results_target[$service]}; do + echo ln -sf $unit /etc/systemd/system/$target.wants/$service.service >/dev/stderr + mkdir -p "/etc/systemd/system/$target.wants" + /bin/ln -sf $unit /etc/systemd/system/$target.wants/$service.service done done fi diff --git a/systemd.changes b/systemd.changes index ffafade9..cf442750 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de + +- Edit pkgconfig(liblz4) dependency: liblz4 now uses 1.x *again* + +------------------------------------------------------------------- +Thu Jul 6 14:12:34 UTC 2017 - fbui@suse.com + +- Added 0001-core-disable-session-keyring-per-system-sevice-entir.patch (bnc#1045886) + + Temporary patch to disable the session keyring stuff as it's + currently broken and may introduce some security holes. + +------------------------------------------------------------------- +Thu Jul 6 12:57:06 UTC 2017 - fbui@suse.com + +- Import commit 21827ea0875ff197e16e72003b2bfaa1c6e8daad + + 1ad06735f core: fail when syntactically invalid values for User=/Group= fields are detected (bsc#1047023) + d563972e2 timesyncd: don't use compiled-in list if FallbackNTP has been configured explicitly + f4e0c16f5 gpt-auto-generator: fix the handling of the value returned by fstab_has_fstype() in add_swap() (#6280) + e1345aac5 fix add_esp() in the gpt-auto-generator.c (#6251) + c591ece9a automount: don't lstat(2) upon umount request (#6086) (bsc#1040968) + 643ab2eea gpt-auto-generator: disable gpt auto logic for swaps if at least one is defined in fstab + f07d2022f fstab-util: introduce fstab_has_fstype() helper + bf735bb35 fstab-util: don't eat up errors in fstab_is_mount_point() + a4b40fbed resolved: simplify alloc size calculation (bsc#1045290 CVE-2017-9445) + 8b960bec0 only check signature job error if signature job exists (#6118) (boo#1043758) + 1418bfb5b job: Ensure JobRunningTimeoutSec= survives serialization (#6128) (bsc#1004995) + 19b6d5f08 udev: turn off -Wformat-nonliteral for one safe case + 717ace439 udev: net_id add support for platform bus (ACPI, mostly arm64) devices (#5933) + a3bf2e6b5 core/mount: pass "-c" flag to /bin/umount (#6093) + +------------------------------------------------------------------- +Wed Jul 5 07:15:17 UTC 2017 - fbui@suse.com + +- Add minimal support for boot.d/* scripts in systemd-sysv-convert (boo#1046750) + + While at it, the handling of the symlink priorities is also removed + since it doesn't appear to be used at all. + +------------------------------------------------------------------- +Thu Jun 22 15:24:22 UTC 2017 - fbui@suse.com + +- Don't try to restart networkd/resolved if they're disabled (boo#1045521) + + "systemctl try-restart/preset" wants the unit files exist. + +------------------------------------------------------------------- +Thu Jun 22 13:50:46 UTC 2017 - fbui@suse.com + +- Stop shipping /usr/lib/sysusers.d/basic.conf (bsc#1006978) + + Ok looks like the previous change was the right thing to do and we + continue to follow this path by relying on the new user/group scheme + + Therefore the basic system user/group are now managed and created by + system-sysusers and udev also relies on this for the groups it uses + in its rule files. + + Ideally we should have listed all of the groups in the deps (with + "Requires: group(disk)" but the list of the groups is rather long + and the risk for those groups to be re-organized is probably low, so + currently we simply use "Requires: system-group-hardware" as a + shortcut. + ------------------------------------------------------------------- Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com @@ -11,7 +77,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com package isn't pulled in anymore when building the rescue system. For now make systemd creates the group by adding - "Requires: group(post)". + "Requires: group(lock)". I'm currently not sure why we don't use sysusers.d stuff for that purpose and if the "lock" group on /run/lock is still diff --git a/systemd.spec b/systemd.spec index 55318178..680dcecb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -81,7 +81,7 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) >= 125 +BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -153,6 +153,14 @@ Source14: kbd-model-map.legacy Source1065: udev-remount-tmpfs +# Patches listed in here are really special cases. Normally all +# changes must go to upstream first and then are cherry-picked in the +# SUSE git repository. But in very few cases, some stuff might be +# broken in upstream and need an urgent fix. Even in this case, the +# 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 + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -223,9 +231,8 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: system-group-hardware Requires(pre): /usr/bin/stat -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl @@ -397,6 +404,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} +%autopatch -p1 # only needed for bootstrap %if 0%{?bootstrap} @@ -528,6 +536,10 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf +# The definition of the basic users/groups are defined by system-user +# on SUSE (bsc#1006978). +rm -f %{buildroot}%{_prefix}/lib/sysusers.d/basic.conf + # Remove README file in init.d as (SUSE) rpm requires executable files # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README @@ -680,10 +692,14 @@ if [ $1 -eq 1 ]; then # unit. systemctl preset remote-fs.target || : systemctl preset getty@.service || : + systemctl preset systemd-timesyncd.service || : +%if %{with networkd} systemctl preset systemd-networkd.service || : systemctl preset systemd-networkd-wait-online.service || : - systemctl preset systemd-timesyncd.service || : +%endif +%if %{with resolved} systemctl preset systemd-resolved.service || : +%endif fi >/dev/null # since v207 /etc/sysctl.conf is no longer parsed, however @@ -743,9 +759,13 @@ fi %systemd_postun # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service -%systemd_postun_with_restart systemd-networkd.service %systemd_postun_with_restart systemd-timesyncd.service +%if %{with networkd} +%systemd_postun_with_restart systemd-networkd.service +%endif +%if %{with resolved} %systemd_postun_with_restart systemd-resolved.service +%endif %pretrans -n udev%{?mini} -p if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then @@ -771,12 +791,6 @@ if [ $1 -eq 1 ]; then echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation fi -# Create "tape"/"input" group which is referenced by some udev rules -# that we're shipping. FIXME: maybe we should consider using -# "sysusers_create basic.conf" instead ? -getent group tape >/dev/null || groupadd -r tape || : -getent group input >/dev/null || groupadd -r input || : - %post -n udev%{?mini} %udev_hwdb_update From 7a4c33556c9ccb97402c436b718c0c75d9469ceef78763f65f334d257d973956 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 27 Jul 2017 09:11:15 +0000 Subject: [PATCH 09/10] Accepting request 512668 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/512668 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=257 --- systemd-233.tar.xz | 3 --- systemd-234.tar.xz | 3 +++ systemd-mini.changes | 32 +++++++++++++++++++++++++++++++- systemd-mini.spec | 10 +++++++--- systemd.changes | 32 +++++++++++++++++++++++++++++++- systemd.spec | 10 +++++++--- 6 files changed, 79 insertions(+), 11 deletions(-) delete mode 100644 systemd-233.tar.xz create mode 100644 systemd-234.tar.xz diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz deleted file mode 100644 index a77e6941..00000000 --- a/systemd-233.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d -size 3257376 diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz new file mode 100644 index 00000000..ebe7c123 --- /dev/null +++ b/systemd-234.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ecf38c4f36975e978edd400fe9405528393b656f97feb6188f45de0a9886091 +size 3350388 diff --git a/systemd-mini.changes b/systemd-mini.changes index cf442750..68837bb6 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com + +- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 + + 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) + +------------------------------------------------------------------- +Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com + +- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b + + 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled + 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" + +------------------------------------------------------------------- +Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com + +- Drop support of compression from the mini package + + Hence remove the relevant build-requires from the mini package. + +------------------------------------------------------------------- +Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com + +- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) + + - package /etc/systemd/system/dbus-org.freedesktop.network1.service + - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled + ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -86,7 +116,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) +- Make sure dracut (if installed) will embed the new compat rule The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd-mini.spec b/systemd-mini.spec index dbb34853..8dcb079e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 233 +Version: 234 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -66,6 +66,8 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -83,8 +85,6 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -954,7 +954,9 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so +%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf +%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1034,9 +1036,11 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} diff --git a/systemd.changes b/systemd.changes index cf442750..68837bb6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com + +- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 + + 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) + +------------------------------------------------------------------- +Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com + +- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b + + 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled + 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" + +------------------------------------------------------------------- +Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com + +- Drop support of compression from the mini package + + Hence remove the relevant build-requires from the mini package. + +------------------------------------------------------------------- +Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com + +- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) + + - package /etc/systemd/system/dbus-org.freedesktop.network1.service + - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled + ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -86,7 +116,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) +- Make sure dracut (if installed) will embed the new compat rule The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd.spec b/systemd.spec index 680dcecb..a6ebaa3a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 233 +Version: 234 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -64,6 +64,8 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -81,8 +83,6 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -952,7 +952,9 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so +%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf +%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1032,9 +1034,11 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} From 06bb2b1f4f24ba81db1cd7a85ac0ed786d9404b7c3f775dffa5c614e511bbbb2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 28 Jul 2017 12:30:53 +0000 Subject: [PATCH 10/10] Accepting request 512915 from openSUSE:Factory Revert to version 233; split /usr failed with 234 OBS-URL: https://build.opensuse.org/request/show/512915 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=258 --- systemd-233.tar.xz | 3 +++ systemd-234.tar.xz | 3 --- systemd-mini.changes | 32 +------------------------------- systemd-mini.spec | 10 +++------- systemd.changes | 32 +------------------------------- systemd.spec | 10 +++------- 6 files changed, 11 insertions(+), 79 deletions(-) create mode 100644 systemd-233.tar.xz delete mode 100644 systemd-234.tar.xz diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz new file mode 100644 index 00000000..a77e6941 --- /dev/null +++ b/systemd-233.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d +size 3257376 diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz deleted file mode 100644 index ebe7c123..00000000 --- a/systemd-234.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ecf38c4f36975e978edd400fe9405528393b656f97feb6188f45de0a9886091 -size 3350388 diff --git a/systemd-mini.changes b/systemd-mini.changes index 68837bb6..cf442750 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com - -- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 - - 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) - -------------------------------------------------------------------- -Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com - -- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b - - 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled - 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" - -------------------------------------------------------------------- -Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com - -- Drop support of compression from the mini package - - Hence remove the relevant build-requires from the mini package. - -------------------------------------------------------------------- -Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com - -- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) - - - package /etc/systemd/system/dbus-org.freedesktop.network1.service - - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled - ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -116,7 +86,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd-mini.spec b/systemd-mini.spec index 8dcb079e..dbb34853 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -66,8 +66,6 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -85,6 +83,8 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -954,9 +954,7 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1036,11 +1034,9 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} diff --git a/systemd.changes b/systemd.changes index 68837bb6..cf442750 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com - -- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 - - 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) - -------------------------------------------------------------------- -Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com - -- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b - - 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled - 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" - -------------------------------------------------------------------- -Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com - -- Drop support of compression from the mini package - - Hence remove the relevant build-requires from the mini package. - -------------------------------------------------------------------- -Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com - -- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) - - - package /etc/systemd/system/dbus-org.freedesktop.network1.service - - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled - ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -116,7 +86,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd.spec b/systemd.spec index a6ebaa3a..680dcecb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -64,8 +64,6 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -83,6 +81,8 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -952,9 +952,7 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1034,11 +1032,9 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd}