commit systemd for openSUSE:Factory
Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-08-02 07:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-07-03 16:53:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-08-02 07:26:52.000000000 +0200 @@ -1,0 +2,159 @@ +Thu Aug 1 15:52:20 UTC 2013 - fcrozat@suse.com + +- Ensure /usr/lib/systemd/system/shutdown.target.wants is created + and owned by systemd package. + +------------------------------------------------------------------- +Mon Jul 29 14:01:48 UTC 2013 - fcrozat@suse.com + +- Fix drop-in for getty@tty1.service + +------------------------------------------------------------------- +Thu Jul 25 12:35:29 UTC 2013 - fcrozat@suse.com + +- Move systemd-journal-gateway to subpackage to lower dependencies + in default install. + +------------------------------------------------------------------- +Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org + +- version 206 , highlights: +* Unit files now understand the new %v specifier which + resolves to the kernel version string as returned by "uname-r". +* "journalctl -b" may now be used to look for boot output of a + specific boot. Try "journalctl -b -1" +* Creation of "dead" device nodes has been moved from udev + into kmod and tmpfiles. +* The udev "keymap" data files and tools to apply keyboard + specific mappings of scan to key codes, and force-release + scan code lists have been entirely replaced by a udev + "keyboard" builtin and a hwdb data file. + +- remove patches now in upstream +- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 +- systemd now require the kmod tool in addition to the library. + +------------------------------------------------------------------- +Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com + +- use-usr-sbin-sulogin-for-emergency-service.patch + emergency.service failed to start because sulogin is in /usr/sbin now + +------------------------------------------------------------------- +Fri Jul 12 17:09:23 CEST 2013 - mls@suse.de + +- fix build with rpm-4.11.1: /etc/xdg/system/user is a symlink, + not a directory + +------------------------------------------------------------------- +Fri Jul 5 02:17:19 UTC 2013 - crrodriguez@opensuse.org + +- 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch + fix segfault at shutdown +- 0004-disable-the-cgroups-release-agent-when-shutting-down.patch + disable the cgroups release agent when shutting down. +- 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch + remove ancient fallback code; turn connection error into warning +- 006-suppress-status-message-output-at-shutdown-when-quie.patch + make shutdown honour "quiet" kernel cmdline. + +------------------------------------------------------------------- +Fri Jul 5 02:09:55 UTC 2013 - crrodriguez@opensuse.org + +- fix broken symlink, service is called systemd-random-seed now. + +------------------------------------------------------------------- +Thu Jul 4 10:20:23 CEST 2013 - fcrozat@suse.com + +- Update to release 205: + + two new unit types have been introduced: + - Scope units are very similar to service units, however, are + created out of pre-existing processes -- instead of PID 1 + forking off the processes. + - Slice units may be used to partition system resources in an + hierarchial fashion and then assign other units to them. By + default there are now three slices: system.slice (for all + system services), user.slice (for all user sessions), + machine.slice (for VMs and containers). + + new concept of "transient" units, which are created at runtime + using an API and not based on configuration from disk. + + logind has been updated to make use of scope and slice units to + manage user sessions. Logind will no longer create cgroups + hierchies itself but will relying on PID 1. + + A new mini-daemon "systemd-machined" has been added which + may be used by virtualization managers to register local + VMs/containers. machinectl tool has been added to query + meta-data from systemd-machined. + + Low-level cgroup configuration options ControlGroup=, + ControlGroupModify=, ControlGroupPersistent=, + ControlGroupAttribute= have been removed. High-level attribute + settings or slice units should be used instead? + + A new bus call SetUnitProperties() has been added to alter + various runtime parameters of a unit, including cgroup + parameters. systemctl gained set-properties command to wrap + this call. + + A new tool "systemd-run" has been added which can be used to + run arbitrary command lines as transient services or scopes, + while configuring a number of settings via the command + line. + + nspawn will now inform the user explicitly that kernels with + audit enabled break containers, and suggest the user to turn + off audit. + + Support for detecting the IMA and AppArmor security + frameworks with ConditionSecurity= has been added. + + journalctl gained a new "-k" switch for showing only kernel + messages, mimicking dmesg output; in addition to "--user" + and "--system" switches for showing only user's own logs + and system logs. + + systemd-delta can now show information about drop-in + snippets extending unit files. + + systemd will now look for the "debug" argument on the kernel + command line and enable debug logging, similar to + "systemd.log_level=debug" already did before. + + "systemctl set-default", "systemctl get-default" has been + added to configure the default.target symlink, which + controls what to boot into by default. + + "systemctl set-log-level" has been added as a convenient + way to raise and lower systemd logging threshold. + + "systemd-analyze plot" will now show the time the various + generators needed for execution, as well as information + about the unit file loading. + + libsystemd-journal gained a new sd_journal_open_files() call + for opening specific journal files. journactl also gained a + new switch to expose this new functionality (useful for + debugging). + + systemd gained the new DefaultEnvironment= setting in + /etc/systemd/system.conf to set environment variables for + all services. + + If a privileged process logs a journal message with the + OBJECT_PID= field set, then journald will automatically + augment this with additional OBJECT_UID=, OBJECT_GID=, + OBJECT_COMM=, OBJECT_EXE=, ... fields. This is useful if + system services want to log events about specific client + processes. journactl/systemctl has been updated to make use + of this information if all log messages regarding a specific + unit is requested. +- Remove 0001-journal-letting-interleaved-seqnums-go.patch, + 0002-journal-remember-last-direction-of-search-and-keep-o.patch, + 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch, + 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch, + 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch, + 0160-mount-when-learning-about-the-root-mount-from-mounti.patch, + 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch, + Start-ctrl-alt-del.target-irreversibly.patch, + systemctl-does-not-expand-u-so-revert-back-to-I.patch: merged + upstream. +- Regenerate patches 1007-physical-hotplug-cpu-and-memory.patch, + 1008-add-msft-compability-rules.patch, + Revert-service-drop-support-for-SysV-scripts-for-the-early.patch, + fix-support-for-boot-prefixed-initscript-bnc-746506.patch, + handle-SYSTEMCTL_OPTIONS-environment-variable.patch, + handle-numlock-value-in-etc-sysconfig-keyboard.patch, + insserv-generator.patch, + optionally-warn-if-nss-myhostname-is-called.patch, + remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch, + restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch, + service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch. +- Update macros.systemd.upstream with latest upstream revision. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemd/systemd-rpm-macros.changes 2013-06-20 17:05:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-rpm-macros.changes 2013-08-02 07:26:52.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 4 13:59:43 CEST 2013 - fcrozat@suse.com + +- Resync with systemd v205 macros + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-07-03 16:53:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-08-02 07:26:52.000000000 +0200 @@ -1,0 +2,159 @@ +Thu Aug 1 15:52:20 UTC 2013 - fcrozat@suse.com + +- Ensure /usr/lib/systemd/system/shutdown.target.wants is created + and owned by systemd package. + +------------------------------------------------------------------- +Mon Jul 29 14:01:48 UTC 2013 - fcrozat@suse.com + +- Fix drop-in for getty@tty1.service + +------------------------------------------------------------------- +Thu Jul 25 12:35:29 UTC 2013 - fcrozat@suse.com + +- Move systemd-journal-gateway to subpackage to lower dependencies + in default install. + +------------------------------------------------------------------- +Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org + +- version 206 , highlights: +* Unit files now understand the new %v specifier which + resolves to the kernel version string as returned by "uname-r". +* "journalctl -b" may now be used to look for boot output of a + specific boot. Try "journalctl -b -1" +* Creation of "dead" device nodes has been moved from udev + into kmod and tmpfiles. +* The udev "keymap" data files and tools to apply keyboard + specific mappings of scan to key codes, and force-release + scan code lists have been entirely replaced by a udev + "keyboard" builtin and a hwdb data file. + +- remove patches now in upstream +- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 +- systemd now require the kmod tool in addition to the library. + +------------------------------------------------------------------- +Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com + +- use-usr-sbin-sulogin-for-emergency-service.patch + emergency.service failed to start because sulogin is in /usr/sbin now + +------------------------------------------------------------------- +Fri Jul 12 17:09:23 CEST 2013 - mls@suse.de + +- fix build with rpm-4.11.1: /etc/xdg/system/user is a symlink, + not a directory + +------------------------------------------------------------------- +Fri Jul 5 02:17:19 UTC 2013 - crrodriguez@opensuse.org + +- 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch + fix segfault at shutdown +- 0004-disable-the-cgroups-release-agent-when-shutting-down.patch + disable the cgroups release agent when shutting down. +- 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch + remove ancient fallback code; turn connection error into warning +- 006-suppress-status-message-output-at-shutdown-when-quie.patch + make shutdown honour "quiet" kernel cmdline. + +------------------------------------------------------------------- +Fri Jul 5 02:09:55 UTC 2013 - crrodriguez@opensuse.org + +- fix broken symlink, service is called systemd-random-seed now. + +------------------------------------------------------------------- +Thu Jul 4 10:20:23 CEST 2013 - fcrozat@suse.com + +- Update to release 205: + + two new unit types have been introduced: + - Scope units are very similar to service units, however, are + created out of pre-existing processes -- instead of PID 1 + forking off the processes. + - Slice units may be used to partition system resources in an + hierarchial fashion and then assign other units to them. By + default there are now three slices: system.slice (for all + system services), user.slice (for all user sessions), + machine.slice (for VMs and containers). + + new concept of "transient" units, which are created at runtime + using an API and not based on configuration from disk. + + logind has been updated to make use of scope and slice units to + manage user sessions. Logind will no longer create cgroups + hierchies itself but will relying on PID 1. + + A new mini-daemon "systemd-machined" has been added which + may be used by virtualization managers to register local + VMs/containers. machinectl tool has been added to query + meta-data from systemd-machined. + + Low-level cgroup configuration options ControlGroup=, + ControlGroupModify=, ControlGroupPersistent=, + ControlGroupAttribute= have been removed. High-level attribute + settings or slice units should be used instead? + + A new bus call SetUnitProperties() has been added to alter + various runtime parameters of a unit, including cgroup + parameters. systemctl gained set-properties command to wrap + this call. + + A new tool "systemd-run" has been added which can be used to + run arbitrary command lines as transient services or scopes, + while configuring a number of settings via the command + line. + + nspawn will now inform the user explicitly that kernels with + audit enabled break containers, and suggest the user to turn + off audit. + + Support for detecting the IMA and AppArmor security + frameworks with ConditionSecurity= has been added. + + journalctl gained a new "-k" switch for showing only kernel + messages, mimicking dmesg output; in addition to "--user" + and "--system" switches for showing only user's own logs + and system logs. + + systemd-delta can now show information about drop-in + snippets extending unit files. + + systemd will now look for the "debug" argument on the kernel + command line and enable debug logging, similar to + "systemd.log_level=debug" already did before. + + "systemctl set-default", "systemctl get-default" has been + added to configure the default.target symlink, which + controls what to boot into by default. + + "systemctl set-log-level" has been added as a convenient + way to raise and lower systemd logging threshold. + + "systemd-analyze plot" will now show the time the various + generators needed for execution, as well as information + about the unit file loading. + + libsystemd-journal gained a new sd_journal_open_files() call + for opening specific journal files. journactl also gained a + new switch to expose this new functionality (useful for + debugging). + + systemd gained the new DefaultEnvironment= setting in + /etc/systemd/system.conf to set environment variables for + all services. + + If a privileged process logs a journal message with the + OBJECT_PID= field set, then journald will automatically + augment this with additional OBJECT_UID=, OBJECT_GID=, + OBJECT_COMM=, OBJECT_EXE=, ... fields. This is useful if + system services want to log events about specific client + processes. journactl/systemctl has been updated to make use + of this information if all log messages regarding a specific + unit is requested. +- Remove 0001-journal-letting-interleaved-seqnums-go.patch, + 0002-journal-remember-last-direction-of-search-and-keep-o.patch, + 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch, + 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch, + 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch, + 0160-mount-when-learning-about-the-root-mount-from-mounti.patch, + 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch, + Start-ctrl-alt-del.target-irreversibly.patch, + systemctl-does-not-expand-u-so-revert-back-to-I.patch: merged + upstream. +- Regenerate patches 1007-physical-hotplug-cpu-and-memory.patch, + 1008-add-msft-compability-rules.patch, + Revert-service-drop-support-for-SysV-scripts-for-the-early.patch, + fix-support-for-boot-prefixed-initscript-bnc-746506.patch, + handle-SYSTEMCTL_OPTIONS-environment-variable.patch, + handle-numlock-value-in-etc-sysconfig-keyboard.patch, + insserv-generator.patch, + optionally-warn-if-nss-myhostname-is-called.patch, + remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch, + restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch, + service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch. +- Update macros.systemd.upstream with latest upstream revision. + +------------------------------------------------------------------- Old: ---- 0001-journal-letting-interleaved-seqnums-go.patch 0002-journal-remember-last-direction-of-search-and-keep-o.patch 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch 0160-mount-when-learning-about-the-root-mount-from-mounti.patch 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch 1004-fix-devname-prefix.patch Start-ctrl-alt-del.target-irreversibly.patch systemctl-does-not-expand-u-so-revert-back-to-I.patch systemd-204.tar.xz systemd-insserv_conf New: ---- 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch 0004-disable-the-cgroups-release-agent-when-shutting-down.patch 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch 0006-suppress-status-message-output-at-shutdown-when-quie.patch systemd-206.tar.xz use-usr-sbin-sulogin-for-emergency-service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200 @@ -25,7 +25,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 204 +Version: 206 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -65,9 +65,9 @@ %if ! 0%{?bootstrap} BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(glib-2.0) >= 2.22.0 -BuildRequires: pkgconfig(libcryptsetup) >= 1.4.2 +BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 %endif -BuildRequires: pkgconfig(libkmod) >= 5 +BuildRequires: pkgconfig(libkmod) >= 14 BuildRequires: pkgconfig(liblzma) %if ! 0%{?bootstrap} BuildRequires: pkgconfig(libmicrohttpd) @@ -90,6 +90,7 @@ Requires: %{udevpkgname} >= 172 Requires: dbus-1 >= 1.4.0 Requires: kbd +Requires: kmod >= 14 Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding @@ -168,24 +169,9 @@ Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch # PATCH-FIX-UPSTREAM rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch rjschwei@suse.com -- add lid switch of ARM based Chromebook as a power switch to logind Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch -# PATCH-FIX-UPSTREAM systemctl-does-not-expand-u-so-revert-back-to-I.patch fcrozat@suse.com -- avoids expansion errors. -Patch42: systemctl-does-not-expand-u-so-revert-back-to-I.patch -# PATCH-FIX-UPSTREAM Start-ctrl-alt-del.target-irreversibly.patch fcrozat@suse.com -- ctrl-alt-del should be irreversible for reliability. -Patch43: Start-ctrl-alt-del.target-irreversibly.patch -# PATCH-FIX-UPSTREAM 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch crrodriguez@opensuse.org fix systemd-journald[347]: Failed to set ACL on ...user-1000.journal..Invalid argument -Patch44: 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch -# PATCH-FIX-UPSTREAM 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch crrodriguez@opensuse.org ensure systemctl disable removes dangling symlinks -Patch45: 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch -# PATCH-FIX-UPSTREAM 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch crrodriguez@opensuse.org do not report alien child as alive when it is dead. -Patch46: 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch -# PATCH-FIX-UPSTREAM 0001-journal-letting-interleaved-seqnums-go.patch crrodriguez@opensuse.org fix journal infinite loops -Patch47: 0001-journal-letting-interleaved-seqnums-go.patch -# PATCH-FIX-UPSTREAM 0002-journal-remember-last-direction-of-search-and-keep-o.patch crrodriguez@opensuse.org fix journal infinite loops -Patch48: 0002-journal-remember-last-direction-of-search-and-keep-o.patch -# PATCH-FIX-UPSTREAM 0160-mount-when-learning-about-the-root-mount-from-mounti.patch crrodriguez@opensuse.org another case where / is attempted to umount at shutdown -Patch49: 0160-mount-when-learning-about-the-root-mount-from-mounti.patch -# PATCH-FIX-UPSTREAM 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch crrodriguez@opensuse.org only attempt to connect to a session bus if one likely exists. -Patch50: 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch +# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin +Patch46: use-usr-sbin-sulogin-for-emergency-service.patch + # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch @@ -193,8 +179,6 @@ Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch # PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch Patch1003: 1003-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr -Patch1004: 1004-fix-devname-prefix.patch # PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch @@ -370,6 +354,18 @@ a bug report then. This package marks the installation to not use syslog but only the journal. +%package journal-gateway +Summary: Gateway for serving journal events over the network using HTTP +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +%description journal-gateway +systemd-journal-gatewayd serves journal events over the network using HTTP. + %endif %prep @@ -418,20 +414,12 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 %patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 + # udev patches %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 -%patch1004 -p1 %patch1005 -p1 %patch1006 -p1 # don't apply when bootstrapping to not modify Makefile.am @@ -503,7 +491,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants rm -rf %{buildroot}%{_sysconfdir}/rpm find %{buildroot} -type f -name '*.la' -delete -mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants} +mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants,system/shutdown.target.wants} install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd @@ -537,7 +525,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/stoppreload.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/earlyxdm.service ln -s systemd-sysctl.service %{buildroot}/%{_prefix}/lib/systemd/system/sysctl.service -ln -s systemd-random-seed-load.service %{buildroot}/%{_prefix}/lib/systemd/system/random.service +ln -s systemd-random-seed.service %{buildroot}/%{_prefix}/lib/systemd/system/random.service # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount @@ -596,7 +584,7 @@ # create drop-in to prevent tty1 to be cleared (bnc#804158) mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ -echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf [Service] # ensure tty1 isn't cleared (bnc#804158) TTYVTDisallocate=no @@ -609,10 +597,11 @@ F /run/udev/rules.d/80-net-name-slot.rules 0644 - - - "#disable predictable network interface naming for now" EOF +# packaged in systemd-rpm-macros +rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd + %pre getent group systemd-journal >/dev/null || groupadd -r systemd-journal || : -getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : -getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : exit 0 %post @@ -761,6 +750,21 @@ %postun -n nss-myhostname -p /sbin/ldconfig +%pre journal-gateway +getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : +getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : +%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +exit 0 + +%post journal-gateway +%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + +%preun journal-gateway +%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + +%postun journal-gateway +%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + %endif %files @@ -772,11 +776,13 @@ %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl +%{_bindir}/machinectl %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-coredumpctl %{_bindir}/systemd-delta %{_bindir}/systemd-notify +%{_bindir}/systemd-run %{_bindir}/systemd-journalctl %{_bindir}/journalctl %{_bindir}/systemd-ask-password @@ -810,8 +816,10 @@ %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* %{_prefix}/lib/systemd/system/*.automount %{_prefix}/lib/systemd/system/*.service +%{_prefix}/lib/systemd/system/*.slice %{_prefix}/lib/systemd/system/*.target %{_prefix}/lib/systemd/system/*.mount %{_prefix}/lib/systemd/system/*.timer @@ -821,6 +829,7 @@ %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service %exclude %{_prefix}/lib/systemd/systemd-udevd +%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %dir %{_prefix}/lib/systemd/catalog @@ -867,7 +876,7 @@ %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%dir %{_sysconfdir}/xdg/systemd/user +%{_sysconfdir}/xdg/systemd/user %config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -875,6 +884,7 @@ %config(noreplace) %{_sysconfdir}/systemd/user.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf @@ -888,6 +898,7 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -896,6 +907,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy +%exclude %{_datadir}/systemd/gatewayd %{_datadir}/systemd %if ! 0%{?bootstrap} @@ -908,7 +920,7 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* - +%exclude %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -990,15 +1002,10 @@ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id %{_prefix}/lib/udev/collect -%{_prefix}/lib/udev/findkeyboards -%{_prefix}/lib/udev/keymap %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%dir %{_prefix}/lib/udev/keymaps -%{_prefix}/lib/udev/keymaps/* -%{_prefix}/lib/udev/keyboard-force-release.sh %dir %{_prefix}/lib/udev/rules.d/ %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules @@ -1077,6 +1084,12 @@ %{_sbindir}/nss-myhostname-config /%{_lib}/*nss_myhostname* +%files journal-gateway +%defattr(-, root, root) +%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* +%{_prefix}/lib/systemd/systemd-journal-gatewayd +%{_mandir}/man8/systemd-journal-gatewayd.* +%{_datadir}/systemd/gatewayd %endif %changelog ++++++ systemd-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: util-linux Name: systemd-rpm-macros -Version: 1 +Version: 2 Release: 0 Summary: RPM macros for systemd License: LGPL-2.1+ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200 @@ -23,7 +23,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 204 +Version: 206 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -60,9 +60,9 @@ %if ! 0%{?bootstrap} BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(glib-2.0) >= 2.22.0 -BuildRequires: pkgconfig(libcryptsetup) >= 1.4.2 +BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 %endif -BuildRequires: pkgconfig(libkmod) >= 5 +BuildRequires: pkgconfig(libkmod) >= 14 BuildRequires: pkgconfig(liblzma) %if ! 0%{?bootstrap} BuildRequires: pkgconfig(libmicrohttpd) @@ -85,6 +85,7 @@ Requires: %{udevpkgname} >= 172 Requires: dbus-1 >= 1.4.0 Requires: kbd +Requires: kmod >= 14 Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding @@ -163,24 +164,9 @@ Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch # PATCH-FIX-UPSTREAM rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch rjschwei@suse.com -- add lid switch of ARM based Chromebook as a power switch to logind Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch -# PATCH-FIX-UPSTREAM systemctl-does-not-expand-u-so-revert-back-to-I.patch fcrozat@suse.com -- avoids expansion errors. -Patch42: systemctl-does-not-expand-u-so-revert-back-to-I.patch -# PATCH-FIX-UPSTREAM Start-ctrl-alt-del.target-irreversibly.patch fcrozat@suse.com -- ctrl-alt-del should be irreversible for reliability. -Patch43: Start-ctrl-alt-del.target-irreversibly.patch -# PATCH-FIX-UPSTREAM 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch crrodriguez@opensuse.org fix systemd-journald[347]: Failed to set ACL on ...user-1000.journal..Invalid argument -Patch44: 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch -# PATCH-FIX-UPSTREAM 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch crrodriguez@opensuse.org ensure systemctl disable removes dangling symlinks -Patch45: 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch -# PATCH-FIX-UPSTREAM 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch crrodriguez@opensuse.org do not report alien child as alive when it is dead. -Patch46: 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch -# PATCH-FIX-UPSTREAM 0001-journal-letting-interleaved-seqnums-go.patch crrodriguez@opensuse.org fix journal infinite loops -Patch47: 0001-journal-letting-interleaved-seqnums-go.patch -# PATCH-FIX-UPSTREAM 0002-journal-remember-last-direction-of-search-and-keep-o.patch crrodriguez@opensuse.org fix journal infinite loops -Patch48: 0002-journal-remember-last-direction-of-search-and-keep-o.patch -# PATCH-FIX-UPSTREAM 0160-mount-when-learning-about-the-root-mount-from-mounti.patch crrodriguez@opensuse.org another case where / is attempted to umount at shutdown -Patch49: 0160-mount-when-learning-about-the-root-mount-from-mounti.patch -# PATCH-FIX-UPSTREAM 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch crrodriguez@opensuse.org only attempt to connect to a session bus if one likely exists. -Patch50: 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch +# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin +Patch46: use-usr-sbin-sulogin-for-emergency-service.patch + # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch @@ -188,8 +174,6 @@ Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch # PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch Patch1003: 1003-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr -Patch1004: 1004-fix-devname-prefix.patch # PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch @@ -365,6 +349,18 @@ a bug report then. This package marks the installation to not use syslog but only the journal. +%package journal-gateway +Summary: Gateway for serving journal events over the network using HTTP +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +%description journal-gateway +systemd-journal-gatewayd serves journal events over the network using HTTP. + %endif %prep @@ -413,20 +409,12 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 %patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 + # udev patches %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 -%patch1004 -p1 %patch1005 -p1 %patch1006 -p1 # don't apply when bootstrapping to not modify Makefile.am @@ -498,7 +486,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants rm -rf %{buildroot}%{_sysconfdir}/rpm find %{buildroot} -type f -name '*.la' -delete -mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants} +mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants,system/shutdown.target.wants} install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd @@ -532,7 +520,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/stoppreload.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/earlyxdm.service ln -s systemd-sysctl.service %{buildroot}/%{_prefix}/lib/systemd/system/sysctl.service -ln -s systemd-random-seed-load.service %{buildroot}/%{_prefix}/lib/systemd/system/random.service +ln -s systemd-random-seed.service %{buildroot}/%{_prefix}/lib/systemd/system/random.service # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount @@ -591,7 +579,7 @@ # create drop-in to prevent tty1 to be cleared (bnc#804158) mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ -echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf [Service] # ensure tty1 isn't cleared (bnc#804158) TTYVTDisallocate=no @@ -604,10 +592,11 @@ F /run/udev/rules.d/80-net-name-slot.rules 0644 - - - "#disable predictable network interface naming for now" EOF +# packaged in systemd-rpm-macros +rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd + %pre getent group systemd-journal >/dev/null || groupadd -r systemd-journal || : -getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : -getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : exit 0 %post @@ -756,6 +745,21 @@ %postun -n nss-myhostname -p /sbin/ldconfig +%pre journal-gateway +getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : +getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : +%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +exit 0 + +%post journal-gateway +%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + +%preun journal-gateway +%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + +%postun journal-gateway +%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service + %endif %files @@ -767,11 +771,13 @@ %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl +%{_bindir}/machinectl %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-coredumpctl %{_bindir}/systemd-delta %{_bindir}/systemd-notify +%{_bindir}/systemd-run %{_bindir}/systemd-journalctl %{_bindir}/journalctl %{_bindir}/systemd-ask-password @@ -805,8 +811,10 @@ %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* %{_prefix}/lib/systemd/system/*.automount %{_prefix}/lib/systemd/system/*.service +%{_prefix}/lib/systemd/system/*.slice %{_prefix}/lib/systemd/system/*.target %{_prefix}/lib/systemd/system/*.mount %{_prefix}/lib/systemd/system/*.timer @@ -816,6 +824,7 @@ %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service %exclude %{_prefix}/lib/systemd/systemd-udevd +%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %dir %{_prefix}/lib/systemd/catalog @@ -862,7 +871,7 @@ %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%dir %{_sysconfdir}/xdg/systemd/user +%{_sysconfdir}/xdg/systemd/user %config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -870,6 +879,7 @@ %config(noreplace) %{_sysconfdir}/systemd/user.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf @@ -883,6 +893,7 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -891,6 +902,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy +%exclude %{_datadir}/systemd/gatewayd %{_datadir}/systemd %if ! 0%{?bootstrap} @@ -903,7 +915,7 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* - +%exclude %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -985,15 +997,10 @@ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id %{_prefix}/lib/udev/collect -%{_prefix}/lib/udev/findkeyboards -%{_prefix}/lib/udev/keymap %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%dir %{_prefix}/lib/udev/keymaps -%{_prefix}/lib/udev/keymaps/* -%{_prefix}/lib/udev/keyboard-force-release.sh %dir %{_prefix}/lib/udev/rules.d/ %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules @@ -1072,6 +1079,12 @@ %{_sbindir}/nss-myhostname-config /%{_lib}/*nss_myhostname* +%files journal-gateway +%defattr(-, root, root) +%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* +%{_prefix}/lib/systemd/systemd-journal-gatewayd +%{_mandir}/man8/systemd-journal-gatewayd.* +%{_datadir}/systemd/gatewayd %endif %changelog ++++++ 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch ++++++
From 1e4fc9b1d8449e87474b3af8a4ddab09fab27cd5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer
Date: Thu, 4 Jul 2013 11:01:47 +0200 Subject: [PATCH 2/6] core/mount.c:mount_dump(): don't segfault, if mount is not mounted anymore
Don't segfault, if m->from_proc_self_mountinfo and m->from_fragment is false. https://bugzilla.redhat.com/show_bug.cgi?id=957783#c9 --- src/core/mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index 3cc3e65..58a3f11 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -822,9 +822,9 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { prefix, mount_state_to_string(m->state), prefix, mount_result_to_string(m->result), prefix, m->where, - prefix, strna(p->what), - prefix, strna(p->fstype), - prefix, strna(p->options), + prefix, p ? strna(p->what) : "n/a", + prefix, p ? strna(p->fstype) : "n/a", + prefix, p ? strna(p->options) : "n/a", prefix, yes_no(m->from_proc_self_mountinfo), prefix, yes_no(m->from_fragment), prefix, m->directory_mode); -- 1.8.1.4 ++++++ 0004-disable-the-cgroups-release-agent-when-shutting-down.patch ++++++
From ad929bcc27e2c6c1aa731053e45882686e9babab Mon Sep 17 00:00:00 2001 From: Kay Sievers
Date: Thu, 4 Jul 2013 20:31:18 +0200 Subject: [PATCH 4/6] disable the cgroups release agent when shutting down
During shutdown, when we try to clean up all remaining processes, the kernel will fork new agents every time a cgroup runs empty. These new processes cause delays in the final SIGTERM, SIGKILL logic. Apart from that, this should also avoid that the kernel-forked binaries cause unpredictably timed access to the filesystem which we might need to unmount. --- src/core/main.c | 4 ++++ src/shared/cgroup-util.c | 15 +++++++++++++++ src/shared/cgroup-util.h | 1 + 3 files changed, 20 insertions(+) diff --git a/src/core/main.c b/src/core/main.c index 8b8e110..ada0f9d 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1942,6 +1942,10 @@ finish: watchdog_close(true); } + /* avoid the creation of new processes forked by the kernel; at this + * point, we will not listen to the signals anyway */ + cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER); + execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block); free(env_block); log_error("Failed to execute shutdown binary, freezing: %m"); diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 390259e..73013d1 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -790,6 +790,21 @@ int cg_install_release_agent(const char *controller, const char *agent) { return 0; } +int cg_uninstall_release_agent(const char *controller) { + _cleanup_free_ char *fs = NULL; + int r; + + r = cg_get_path(controller, NULL, "release_agent", &fs); + if (r < 0) + return r; + + r = write_string_file(fs, ""); + if (r < 0) + return r; + + return 0; +} + int cg_is_empty(const char *controller, const char *path, bool ignore_self) { _cleanup_fclose_ FILE *f = NULL; pid_t pid = 0, self_pid; diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h index c781aab..0fc93c1 100644 --- a/src/shared/cgroup-util.h +++ b/src/shared/cgroup-util.h @@ -89,6 +89,7 @@ int cg_set_group_access(const char *controller, const char *path, mode_t mode, u int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid); int cg_install_release_agent(const char *controller, const char *agent); +int cg_uninstall_release_agent(const char *controller); int cg_is_empty(const char *controller, const char *path, bool ignore_self); int cg_is_empty_by_spec(const char *spec, bool ignore_self); -- 1.8.1.4 ++++++ 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch ++++++
From c1eba3008cac9e625b8bb774e9b44ceec8465980 Mon Sep 17 00:00:00 2001 From: Kay Sievers
Date: Thu, 4 Jul 2013 20:54:40 +0200 Subject: [PATCH 5/6] cgroups-agent: remove ancient fallback code; turn connection error into warning
During re-execution and shutdown cgroups agents might not be able to connect to systemd's private D-Bus socket, the printed error to the console is misleding in that case, so turn it into a warning. --- src/cgroups-agent/cgroups-agent.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c index 0e3d2b7..a47949a 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.c @@ -48,26 +48,19 @@ int main(int argc, char *argv[]) { * this to avoid an activation loop when we start dbus when we * are called when the dbus service is shut down. */ - if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) { -#ifndef NOLEGACY - dbus_error_free(&error); - - /* Retry with the pre v21 socket name, to ease upgrades */ - if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) { -#endif - log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); - goto finish; - } -#ifndef NOLEGACY + bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error); + if (!bus) { + log_warning("Failed to get D-Bus connection: %s", bus_error_message(&error)); + goto finish; } -#endif if (bus_check_peercred(bus) < 0) { log_error("Bus owner not root."); goto finish; } - if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) { + m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"); + if (!m) { log_error("Could not allocate signal message."); goto finish; } -- 1.8.1.4 ++++++ 0006-suppress-status-message-output-at-shutdown-when-quie.patch ++++++
From ec26be514ff3c5367b21f9881369080bda54fd2d Mon Sep 17 00:00:00 2001 From: Kay Sievers
Date: Fri, 5 Jul 2013 00:32:05 +0200 Subject: [PATCH 6/6] suppress status message output at shutdown when 'quiet' is given
---
src/core/main.c | 4 ++--
src/core/shutdown.c | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
index ada0f9d..243855f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1942,9 +1942,9 @@ finish:
watchdog_close(true);
}
- /* avoid the creation of new processes forked by the kernel; at this
+ /* avoid the creation of new processes forked by the kernel; at this
* point, we will not listen to the signals anyway */
- cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
+ cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block);
free(env_block);
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 2db761d..c02a14d 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -39,6 +39,7 @@
#include "missing.h"
#include "log.h"
+#include "fileio.h"
#include "umount.h"
#include "util.h"
#include "mkdir.h"
@@ -130,12 +131,26 @@ static int pivot_to_new_root(void) {
}
int main(int argc, char *argv[]) {
+ _cleanup_free_ char *line = NULL;
int cmd, r;
unsigned retries;
bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true;
bool in_container, use_watchdog = false;
char *arguments[3];
+ /* suppress shutdown status output if 'quiet' is used */
+ r = read_one_line_file("/proc/cmdline", &line);
+ if (r >= 0) {
+ char *w, *state;
+ size_t l;
+
+ FOREACH_WORD_QUOTED(w, l, line, state)
+ if (streq(w, "quiet")) {
+ log_set_max_level(LOG_WARNING);
+ break;
+ }
+ }
+
log_parse_environment();
log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */
log_open();
--
1.8.1.4
++++++ 1001-re-enable-by_path-links-for-ata-devices.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -7,11 +7,9 @@
src/udev/udev-builtin-path_id.c | 92 +++++++++++++++++++++++++++++++++++------
1 file changed, 80 insertions(+), 12 deletions(-)
-diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index da02731..a77d4e8 100644
---- a/src/udev/udev-builtin-path_id.c
-+++ b/src/udev/udev-builtin-path_id.c
-@@ -338,6 +338,85 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char *
+--- systemd-206.orig/src/udev/udev-builtin-path_id.c
++++ systemd-206/src/udev/udev-builtin-path_id.c
+@@ -338,6 +338,85 @@ static struct udev_device *handle_scsi_h
return parent;
}
@@ -97,7 +95,7 @@
static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
{
const char *devtype;
-@@ -374,19 +453,8 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
+@@ -374,19 +453,8 @@ static struct udev_device *handle_scsi(s
goto out;
}
++++++ 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -7,11 +7,9 @@
rules/60-persistent-storage.rules | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index a4d009a..f720c7e 100644
---- a/rules/60-persistent-storage.rules
-+++ b/rules/60-persistent-storage.rules
-@@ -42,6 +42,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="s
+--- systemd-206.orig/rules/60-persistent-storage.rules
++++ systemd-206/rules/60-persistent-storage.rules
+@@ -42,6 +42,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk",
KERNEL=="sd*|sr*|cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="sd*|cciss*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
++++++ 1003-udev-netlink-null-rules.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -7,11 +7,9 @@
src/udev/udevd.c | 2 ++
1 file changed, 2 insertions(+)
-Index: systemd-202/src/udev/udevd.c
-===================================================================
---- systemd-202.orig/src/udev/udevd.c
-+++ systemd-202/src/udev/udevd.c
-@@ -1407,6 +1407,8 @@ int main(int argc, char *argv[])
+--- systemd-206.orig/src/udev/udevd.c
++++ systemd-206/src/udev/udevd.c
+@@ -1337,6 +1337,8 @@ int main(int argc, char *argv[])
dev = udev_monitor_receive_device(monitor);
if (dev != NULL) {
udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC));
++++++ 1005-create-default-links-for-primary-cd_dvd-drive.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -7,11 +7,9 @@
rules/60-cdrom_id.rules | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/rules/60-cdrom_id.rules b/rules/60-cdrom_id.rules
-index 6eaf76a..ec0b19a 100644
---- a/rules/60-cdrom_id.rules
-+++ b/rules/60-cdrom_id.rules
-@@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdr
+--- systemd-206.orig/rules/60-cdrom_id.rules
++++ systemd-206/rules/60-cdrom_id.rules
+@@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdr
# enable the receiving of media eject button events
IMPORT{program}="cdrom_id --lock-media $devnode"
++++++ 1006-udev-always-rename-network.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -8,10 +8,8 @@
src/udev/udev-event.c | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
-Index: systemd-204/src/udev/udev-event.c
-===================================================================
---- systemd-204.orig/src/udev/udev-event.c
-+++ systemd-204/src/udev/udev-event.c
+--- systemd-206.orig/src/udev/udev-event.c
++++ systemd-206/src/udev/udev-event.c
@@ -750,6 +750,7 @@ static int rename_netif(struct udev_even
struct udev_device *dev = event->dev;
int sk;
++++++ 1007-physical-hotplug-cpu-and-memory.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -1,7 +1,5 @@
-Index: systemd-204/rules/80-hotplug-cpu-mem.rules
-===================================================================
--- /dev/null
-+++ systemd-204/rules/80-hotplug-cpu-mem.rules
++++ systemd-206/rules/80-hotplug-cpu-mem.rules
@@ -0,0 +1,9 @@
+# do not edit this file, it will be overwritten on update
+
@@ -12,11 +10,9 @@
+# Hotplug physical memory
+SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", \
+ ATTR{state}="online"
-Index: systemd-204/Makefile.am
-===================================================================
---- systemd-204.orig/Makefile.am
-+++ systemd-204/Makefile.am
-@@ -2238,6 +2238,10 @@ dist_udevrules_DATA += \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -2480,6 +2480,10 @@ dist_udevrules_DATA += \
rules/73-seat-numlock.rules
# ------------------------------------------------------------------------------
++++++ 1008-add-msft-compability-rules.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -1,8 +1,6 @@
-Index: systemd-204/Makefile.am
-===================================================================
---- systemd-204.orig/Makefile.am
-+++ systemd-204/Makefile.am
-@@ -2242,6 +2242,10 @@ dist_udevrules_DATA += \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -2484,6 +2484,10 @@ dist_udevrules_DATA += \
rules/80-hotplug-cpu-mem.rules
# ------------------------------------------------------------------------------
@@ -13,10 +11,8 @@
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \
-Index: systemd-204/rules/61-msft.rules
-===================================================================
--- /dev/null
-+++ systemd-204/rules/61-msft.rules
++++ systemd-206/rules/61-msft.rules
@@ -0,0 +1,9 @@
+# MSFT compability rules
+ACTION!="add|change", GOTO="msft_end"
++++++ Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -8,10 +8,8 @@
tmpfiles.d/legacy.conf | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
-index 3fff347..81d5e47 100644
---- a/tmpfiles.d/legacy.conf
-+++ b/tmpfiles.d/legacy.conf
+--- systemd-206.orig/tmpfiles.d/legacy.conf
++++ systemd-206/tmpfiles.d/legacy.conf
@@ -10,12 +10,13 @@
# These files are considered legacy and are unnecessary on legacy-free
# systems.
++++++ Forward-suspend-hibernate-calls-to-pm-utils.patch ++++++
--- /var/tmp/diff_new_pack.x9jAOm/_old 2013-08-02 07:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.x9jAOm/_new 2013-08-02 07:26:56.000000000 +0200
@@ -7,10 +7,8 @@
src/sleep/sleep.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
-diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index a56ab89..232ab67 100644
---- a/src/sleep/sleep.c
-+++ b/src/sleep/sleep.c
+--- systemd-206.orig/src/sleep/sleep.c
++++ systemd-206/src/sleep/sleep.c
@@ -24,6 +24,7 @@
#include
participants (1)
-
root@hilbert.suse.de