Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-06-05 13:16:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-28 07:43:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-06-05 13:16:24.000000000 +0200 @@ -1,0 +2,59 @@ +Wed May 29 10:44:11 CEST 2013 - [email protected] + +- Update to release 204: + + systemd-nspawn creates etc/resolv.conf in container if needed. + + systemd-nspawn will store metadata about container in container + cgroup including its root directory. + + cgroup hierarchy has been reworked, all objects are now suffxed + (with .session for user sessions, .user for users, .nspawn for + containers). All cgroup names are now escaped to preven + collision of object names. + + systemctl list-dependencies gained --plain, --reverse, --after + and --before switches. + + systemd-inhibit shows processes name taking inhibitor lock. + + nss-myhostname will now resolve "localhost" implicitly. + + .include is not allowed recursively anymore and only in unit + files. Drop-in files should be favored in most cases. + + systemd-analyze gained "critical-chain" command, to get slowest + chain of units run during boot-up. + + [email protected] has been added to easily run nspawn + container for system services. Just start + "[email protected]" and container from + /var/lib/container/foobar" will be booted. + + systemd-cgls has new --machine parameter to list processes from + one container. + + ConditionSecurity= can now check for apparmor and SMACK. + + /etc/systemd/sleep.conf has been introduced to configure which + kernel operation will be execute when "suspend", "hibernate" or + "hybrid-sleep" is requrested. It allow new kernel "freeze" + state to be used too. (This setting won't have any effect if + pm-utils is installed). + + ENV{SYSTEMD_WANTS} in udev rules will now implicitly escape + passed argument if applicable. +- Regenerate some patches for this new release. +- Rename hostname-setup-shortname.patch to + ensure-shortname-is-set-as-hostname-bnc-820213.patch to be git + format-patch friendly. +- Update apply-ACL-for-nvidia-device-nodes.patch to apply ACL to + /dev/nvidia* (bnc#808319). +- Remove Ensure-debugshell-has-a-correct-value.patch, doable with a + configure option. +- Add systemctl-does-not-expand-u-so-revert-back-to-I.patch: avoids + expansion errors. +- Add Start-ctrl-alt-del.target-irreversibly.patch: ctrl-alt-del + should be irreversible for reliability. + +------------------------------------------------------------------- +Tue May 28 03:24:39 UTC 2013 - [email protected] + +- Drop Add-bootsplash-handling-for-password-dialogs.patch bootsplash +support has been removed from the kernel. +- Drop ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch +fixed in systemd v199, commit 89d09e1b5c65a2d97840f682e0932c8bb499f166 +- Apply rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch +only on ARM, patch rejected upstream because is too generic. +- no such define TARGET_SUSE exists but it is used in +Revert-service-drop-support-for-SysV-scripts-for-the-early.patch +use HAVE_SYSV_COMPAT instead. + +------------------------------------------------------------------- systemd.changes: same change Old: ---- Add-bootsplash-handling-for-password-dialogs.patch Ensure-debugshell-has-a-correct-value.patch ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch hostname-setup-shortname.patch systemd-202.tar.xz New: ---- Start-ctrl-alt-del.target-irreversibly.patch ensure-shortname-is-set-as-hostname-bnc-820213.patch systemctl-does-not-expand-u-so-revert-back-to-I.patch systemd-204.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -25,7 +25,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 202 +Version: 204 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -118,7 +118,6 @@ Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch # PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch [email protected] -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch -Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch3: handle-disable_caplock-and-compose_table-and-kbd_rate.patch Patch4: handle-numlock-value-in-etc-sysconfig-keyboard.patch @@ -138,16 +137,12 @@ # PATCH-FIX-OPENSUSE ensure-ask-password-wall-starts-after-getty-tty1.patch -- don't start getty on tty1 until all password request are done Patch5: ensure-ask-password-wall-starts-after-getty-tty1.patch -# PATCH-FIX-OPENSUSE Ensure-debugshell-has-a-correct-value.patch [email protected] bnc#789052 -- use bash if sushell isn't available -Patch19: Ensure-debugshell-has-a-correct-value.patch # PATCH-FIX-OPENSUSE handle-root_uses_lang-value-in-etc-sysconfig-language.patch bnc#792182 [email protected] -- handle ROOT_USES_LANG=ctype Patch20: handle-root_uses_lang-value-in-etc-sysconfig-language.patch # PATCH-FIX-OPENSUSE allow-multiple-sulogin-to-be-started.patch bnc#793182 [email protected] -- handle multiple sulogin Patch21: allow-multiple-sulogin-to-be-started.patch # PATCH-FIX-OPENSUSE handle-SYSTEMCTL_OPTIONS-environment-variable.patch bnc#798620 [email protected] -- handle SYSTEMCTL_OPTIONS environment variable Patch22: handle-SYSTEMCTL_OPTIONS-environment-variable.patch -# PATCH-FIX-UPSTREAM ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch bnc#809820 [email protected] -- loopback mount should be started after /dev/loop-control is available -Patch26: ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch # PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-device-nodes.patch bnc#808319 -- set ACL on nvidia devices Patch27: apply-ACL-for-nvidia-device-nodes.patch # PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch [email protected] -- handle boot.* initscripts @@ -156,8 +151,8 @@ Patch39: systemd-tmp-safe-defaults.patch # PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 [email protected] -- handle /boot/sysctl.conf-<kernel_release> file Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch -# PATCH-FIX-OPENSUSE hostname-setup-shortname.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname -Patch41: hostname-setup-shortname.patch +# PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname +Patch41: ensure-shortname-is-set-as-hostname-bnc-820213.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -171,6 +166,10 @@ 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- ctrl-alt-del should be irreversible for reliability. +Patch43: Start-ctrl-alt-del.target-irreversibly.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -372,7 +371,6 @@ #systemd %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 # don't apply when bootstrapping to not modify configure.in %if ! 0%{?bootstrap} @@ -392,20 +390,22 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 -%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %patch27 -p1 %patch37 -p1 +%ifarch %arm %patch38 -p1 +%endif %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 +%patch43 -p1 %build autoreconf -fiv @@ -431,6 +431,7 @@ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ --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 \ CFLAGS="%{optflags}" make %{?_smp_mflags} @@ -771,6 +772,10 @@ %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -23,7 +23,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 202 +Version: 204 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -113,7 +113,6 @@ Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch # PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch [email protected] -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch -Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch3: handle-disable_caplock-and-compose_table-and-kbd_rate.patch Patch4: handle-numlock-value-in-etc-sysconfig-keyboard.patch @@ -133,16 +132,12 @@ # PATCH-FIX-OPENSUSE ensure-ask-password-wall-starts-after-getty-tty1.patch -- don't start getty on tty1 until all password request are done Patch5: ensure-ask-password-wall-starts-after-getty-tty1.patch -# PATCH-FIX-OPENSUSE Ensure-debugshell-has-a-correct-value.patch [email protected] bnc#789052 -- use bash if sushell isn't available -Patch19: Ensure-debugshell-has-a-correct-value.patch # PATCH-FIX-OPENSUSE handle-root_uses_lang-value-in-etc-sysconfig-language.patch bnc#792182 [email protected] -- handle ROOT_USES_LANG=ctype Patch20: handle-root_uses_lang-value-in-etc-sysconfig-language.patch # PATCH-FIX-OPENSUSE allow-multiple-sulogin-to-be-started.patch bnc#793182 [email protected] -- handle multiple sulogin Patch21: allow-multiple-sulogin-to-be-started.patch # PATCH-FIX-OPENSUSE handle-SYSTEMCTL_OPTIONS-environment-variable.patch bnc#798620 [email protected] -- handle SYSTEMCTL_OPTIONS environment variable Patch22: handle-SYSTEMCTL_OPTIONS-environment-variable.patch -# PATCH-FIX-UPSTREAM ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch bnc#809820 [email protected] -- loopback mount should be started after /dev/loop-control is available -Patch26: ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch # PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-device-nodes.patch bnc#808319 -- set ACL on nvidia devices Patch27: apply-ACL-for-nvidia-device-nodes.patch # PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch [email protected] -- handle boot.* initscripts @@ -151,8 +146,8 @@ Patch39: systemd-tmp-safe-defaults.patch # PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 [email protected] -- handle /boot/sysctl.conf-<kernel_release> file Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch -# PATCH-FIX-OPENSUSE hostname-setup-shortname.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname -Patch41: hostname-setup-shortname.patch +# PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname +Patch41: ensure-shortname-is-set-as-hostname-bnc-820213.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -166,6 +161,10 @@ 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- ctrl-alt-del should be irreversible for reliability. +Patch43: Start-ctrl-alt-del.target-irreversibly.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -367,7 +366,6 @@ #systemd %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 # don't apply when bootstrapping to not modify configure.in %if ! 0%{?bootstrap} @@ -387,20 +385,22 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 -%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %patch27 -p1 %patch37 -p1 +%ifarch %arm %patch38 -p1 +%endif %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 +%patch43 -p1 %build autoreconf -fiv @@ -426,6 +426,7 @@ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ --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 \ CFLAGS="%{optflags}" make %{?_smp_mflags} @@ -766,6 +767,10 @@ %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system ++++++ Forward-suspend-hibernate-calls-to-pm-utils.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -4,99 +4,93 @@ forward suspend/hibernation calls to pm-utils, if installed (bnc#790157) --- - src/sleep/sleep.c | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) + 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 f5e78c1..8d91117 100644 +index a56ab89..232ab67 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -22,6 +22,7 @@ - #include <stdio.h> +@@ -24,6 +24,7 @@ #include <errno.h> #include <string.h> + #include <getopt.h> +#include <stdlib.h> - #include "log.h" - #include "util.h" -@@ -32,6 +33,9 @@ - int main(int argc, char *argv[]) { - const char *verb; - char* arguments[4]; -+ const char *pmtools; -+ bool delegate_to_pmutils = false; -+ struct stat buf; - int r; - FILE *f; - -@@ -45,17 +49,27 @@ int main(int argc, char *argv[]) { - goto finish; + #include "systemd/sd-id128.h" + #include "systemd/sd-messages.h" +@@ -35,6 +36,8 @@ + #include "sleep-config.h" + + static char* arg_verb = NULL; ++static bool delegate_to_pmutils = false; ++static const char *pmtools; + + static int write_mode(char **modes) { + int r = 0; +@@ -50,9 +53,6 @@ static int write_mode(char **modes) { + r = k; } -- if (streq(argv[1], "suspend")) -+ if (streq(argv[1], "suspend")) { - verb = "mem"; -- else if (streq(argv[1], "hibernate") || streq(argv[1], "hybrid-sleep")) -+ pmtools = "/usr/sbin/pm-suspend"; -+ } -+ else if (streq(argv[1], "hibernate") || streq(argv[1], "hybrid-sleep")) { - verb = "disk"; -+ if (streq(argv[1], "hibernate")) -+ pmtools = "/usr/sbin/pm-hibernate"; -+ else -+ pmtools = "/usr/sbin/pm-suspend-hybrid"; -+ } - else { - log_error("Unknown action '%s'.", argv[1]); - r = -EINVAL; - goto finish; - } +- if (r < 0) +- log_error("Failed to write mode to /sys/power/disk: %s", +- strerror(-r)); + + return r; + } +@@ -90,6 +90,8 @@ static int execute(char **modes, char **states) { + FILE *f; + const char* note = strappenda("SLEEP=", arg_verb); -+ delegate_to_pmutils = (stat(pmtools, &buf) >= 0 && S_ISREG(buf.st_mode) && (buf.st_mode & 0111)); -+ - /* Configure the hibernation mode */ + if (!delegate_to_pmutils) { - if (streq(argv[1], "hibernate")) { - if (write_string_file("/sys/power/disk", "platform") < 0) - write_string_file("/sys/power/disk", "shutdown"); -@@ -65,13 +79,14 @@ int main(int argc, char *argv[]) { - write_string_file("/sys/power/disk", "shutdown"); - } - + + /* This file is opened first, so that if we hit an error, + * we can abort before modyfing any state. */ f = fopen("/sys/power/state", "we"); - if (!f) { - log_error("Failed to open /sys/power/state: %m"); - r = -errno; - goto finish; - } -- +@@ -102,6 +104,7 @@ static int execute(char **modes, char **states) { + r = write_mode(modes); + if (r < 0) + return r; + } + arguments[0] = NULL; arguments[1] = (char*) "pre"; - arguments[2] = argv[1]; -@@ -97,11 +112,16 @@ int main(int argc, char *argv[]) { - "SLEEP=hybrid-sleep", - NULL); +@@ -114,8 +117,10 @@ static int execute(char **modes, char **states) { + "MESSAGE=Suspending system...", + note, + NULL); +- ++ if (!delegate_to_pmutils) + r = write_state(f, states); ++ else ++ r = -system(pmtools); + if (r < 0) + return r; -+ if (delegate_to_pmutils) { -+ r = -system(pmtools); -+ } -+ else { - fputs(verb, f); - fputc('\n', f); - fflush(f); +@@ -158,6 +163,7 @@ static int parse_argv(int argc, char *argv[]) { + }; - r = ferror(f) ? -errno : 0; -+ } + int c; ++ struct stat buf; - if (streq(argv[1], "suspend")) - log_struct(LOG_INFO, -@@ -119,6 +139,7 @@ int main(int argc, char *argv[]) { - arguments[1] = (char*) "post"; - execute_directory(SYSTEM_SLEEP_PATH, NULL, arguments); + assert(argc >= 0); + assert(argv); +@@ -196,6 +202,18 @@ static int parse_argv(int argc, char *argv[]) { + return -EINVAL; + } -+ if (!delegate_to_pmutils) - fclose(f); ++ if (streq(arg_verb, "suspend")) { ++ pmtools = "/usr/sbin/pm-suspend"; ++ } ++ else if (streq(arg_verb, "hibernate") || streq(arg_verb, "hybrid-sleep")) { ++ if (streq(arg_verb, "hibernate")) ++ pmtools = "/usr/sbin/pm-hibernate"; ++ else ++ pmtools = "/usr/sbin/pm-suspend-hybrid"; ++ } ++ ++ delegate_to_pmutils = (stat(pmtools, &buf) >= 0 && S_ISREG(buf.st_mode) && (buf.st_mode & 0111)); ++ + return 1 /* work to do */; + } - finish: ++++++ Revert-service-drop-support-for-SysV-scripts-for-the-early.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -28,7 +28,7 @@ { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, -+#ifdef TARGET_SUSE ++#ifdef HAVE_SYSV_COMPAT + /* SUSE style boot.d */ + { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif ++++++ Start-ctrl-alt-del.target-irreversibly.patch ++++++ >From f49fd1d57a429d4a05ac86352c017a845f8185b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <[email protected]> Date: Tue, 7 May 2013 14:16:53 +0200 Subject: [PATCH] Start ctrl-alt-del.target irreversibly This makes ctrl-alt-del reboots more robust, just like "systemctl reboot". --- src/core/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c index c7f8f20..0508628 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1372,7 +1372,7 @@ static int manager_process_signal_fd(Manager *m) { case SIGINT: if (m->running_as == SYSTEMD_SYSTEM) { - manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE); + manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY); break; } -- 1.8.1.4 ++++++ apply-ACL-for-nvidia-device-nodes.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -11,12 +11,33 @@ index cb045a9..51093f2 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.c -@@ -240,6 +240,9 @@ int devnode_acl_all(struct udev *udev, +@@ -24,6 +24,7 @@ + #include <acl/libacl.h> + #include <errno.h> + #include <string.h> ++#include <strv.h> + + #include "logind-acl.h" + #include "util.h" +@@ -240,6 +241,22 @@ int devnode_acl_all(struct udev *udev, goto finish; } -+ devnode_acl("/dev/nvidia0", flush, del, old_uid, add, new_uid); -+ devnode_acl("/dev/nvidiactl", flush, del, old_uid, add, new_uid); ++ /* only search for nvidia* if /dev/nvidiactl exists */ ++ if (!devnode_acl("/dev/nvidiactl", flush, del, old_uid, add, new_uid)) { ++ char** directory; ++ char **f, *resolved; ++ ++ if (get_files_in_directory ("/dev", &directory)) { ++ STRV_FOREACH(f,directory) ++ if (startswith(*f,"nvidia")) { ++ resolved = strjoin("/dev/", *f, NULL); ++ devnode_acl(resolved, flush, del, old_uid, add, new_uid); ++ free(resolved); ++ } ++ } ++ strv_free(directory); ++ } + finish: if (e) ++++++ avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -4,16 +4,16 @@ gethostbyaddr_r (bnc#791101) --- - src/nss-myhostname/nss-myhostname.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + src/nss-myhostname/nss-myhostname.c | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c -index 16ccb3e..884eb99 100644 +index 60e256d..e97d4e5 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c -@@ -383,6 +383,12 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( - struct address *a; - unsigned n_addresses = 0, n; +@@ -442,6 +442,12 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( + uint32_t local_address_ipv4 = LOCALADDRESS_IPV4; + const char *canonical = NULL, *additional = NULL; + if (af != AF_INET && af != AF_INET6) { + *errnop = EAFNOSUPPORT; @@ -24,15 +24,3 @@ if (len != PROTO_ADDRESS_SIZE(af)) { *errnop = EINVAL; *h_errnop = NO_RECOVERY; -@@ -398,11 +404,6 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( - - if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) - goto found; -- -- } else { -- *errnop = EAFNOSUPPORT; -- *h_errnop = NO_DATA; -- return NSS_STATUS_UNAVAIL; - } - - ifconf_acquire_addresses(&addresses, &n_addresses); ++++++ ensure-shortname-is-set-as-hostname-bnc-820213.patch ++++++ From: Frederic Crozat <[email protected]> Date: Tue, 28 May 2013 15:17:35 +0200 Subject: ensure shortname is set as hostname (bnc#820213) strip hostname so the domain part isn't set as part of the hostname --- src/core/hostname-setup.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index 0ce683b..1c8e555 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -32,7 +32,7 @@ #include "fileio.h" static int read_and_strip_hostname(const char *path, char **hn) { - char *s; + char *s, *domain; int r; assert(path); @@ -49,6 +49,11 @@ static int read_and_strip_hostname(const char *path, char **hn) { return -ENOENT; } + /* strip any leftover of a domain name */ + if (domain = strchr(s, '.')) { + *domain = NULL; + } + *hn = s; return 0; } ++++++ force-lvm-restart-after-cryptsetup-target-is-reached.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -7,7 +7,7 @@ 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c -index ac0ed58..9b8e229 100644 +index 81b7708..1940985 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -22,6 +22,7 @@ @@ -73,17 +73,17 @@ static int create_disk( const char *name, const char *device, -@@ -331,6 +380,7 @@ int main(int argc, char *argv[]) { +@@ -334,6 +383,7 @@ int main(int argc, char *argv[]) { _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; int r = EXIT_SUCCESS; + bool no_crypttab = false; char **i; - _cleanup_strv_free_ char **arg_proc_cmdline_disks_done = NULL; - _cleanup_strv_free_ char **arg_proc_cmdline_disks = NULL; -@@ -360,8 +410,10 @@ int main(int argc, char *argv[]) { - f = fopen("/etc/crypttab", "re"); + if (argc > 1 && argc != 4) { +@@ -361,8 +411,10 @@ int main(int argc, char *argv[]) { + + f = fopen("/etc/crypttab", "re"); if (!f) { - if (errno == ENOENT) + if (errno == ENOENT) { @@ -93,7 +93,7 @@ else { r = EXIT_FAILURE; log_error("Failed to open /etc/crypttab: %m"); -@@ -445,5 +497,8 @@ int main(int argc, char *argv[]) { +@@ -464,5 +516,8 @@ next: r = EXIT_FAILURE; } ++++++ handle-etc-HOSTNAME.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -9,7 +9,7 @@ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c -index ac508af..15d206c 100644 +index 8aa1cff..0ce683b 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -61,12 +61,24 @@ int hostname_setup(void) { ++++++ optionally-warn-if-nss-myhostname-is-called.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -4,14 +4,14 @@ --- configure.ac | 11 +++++++++++ - src/nss-myhostname/nss-myhostname.c | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+) + src/nss-myhostname/nss-myhostname.c | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+) diff --git a/configure.ac b/configure.ac -index 5173783..e58d694 100644 +index e1278e8..06eb98d 100644 --- a/configure.ac +++ b/configure.ac -@@ -714,6 +714,17 @@ if test "x$enable_myhostname" != "xno"; then +@@ -725,6 +725,17 @@ if test "x$enable_myhostname" != "xno"; then fi AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"]) @@ -30,10 +30,10 @@ AC_ARG_WITH(firmware-path, AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c -index 884eb99..dbd9a2d 100644 +index e97d4e5..a2a6de8 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c -@@ -30,6 +30,9 @@ +@@ -29,6 +29,9 @@ #include <net/if.h> #include <stdlib.h> #include <arpa/inet.h> @@ -43,7 +43,7 @@ #include "ifconf.h" #include "macro.h" -@@ -44,6 +47,10 @@ +@@ -47,6 +50,10 @@ #define LOCALADDRESS_IPV6 &in6addr_loopback #define LOOPBACK_INTERFACE "lo" @@ -54,40 +54,37 @@ enum nss_status _nss_myhostname_gethostbyname4_r( const char *name, struct gaih_addrtuple **pat, -@@ -115,6 +122,10 @@ enum nss_status _nss_myhostname_gethostbyname4_r( - return NSS_STATUS_NOTFOUND; - } +@@ -129,6 +136,9 @@ enum nss_status _nss_myhostname_gethostbyname4_r( + return NSS_STATUS_NOTFOUND; + } +#ifdef LOG_NSS_MY_HOSTNAME_WARNING -+ warn(hn); ++ warn(hn); +#endif -+ - /* If this fails, n_addresses is 0. Which is fine */ - ifconf_acquire_addresses(&addresses, &n_addresses); + /* If this fails, n_addresses is 0. Which is fine */ + ifconf_acquire_addresses(&addresses, &n_addresses); -@@ -334,6 +345,10 @@ enum nss_status _nss_myhostname_gethostbyname3_r( - return NSS_STATUS_NOTFOUND; +@@ -382,6 +392,9 @@ enum nss_status _nss_myhostname_gethostbyname3_r( + local_address_ipv4 = LOCALADDRESS_IPV4; } +#ifdef LOG_NSS_MY_HOSTNAME_WARNING + warn(hn); +#endif -+ - return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, canonp); - } - -@@ -429,6 +444,10 @@ found: - return NSS_STATUS_UNAVAIL; + return fill_in_hostent( + canonical, additional, + af, +@@ -509,6 +522,9 @@ found: + canonical = hn; } +#ifdef LOG_NSS_MY_HOSTNAME_WARNING + warn(hn); +#endif -+ - return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, NULL); - - } -@@ -448,3 +467,19 @@ enum nss_status _nss_myhostname_gethostbyaddr_r( + return fill_in_hostent( + canonical, additional, + af, +@@ -537,3 +553,19 @@ enum nss_status _nss_myhostname_gethostbyaddr_r( errnop, h_errnop, NULL); } ++++++ parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -1,7 +1,6 @@ -From 0d4db3c514f1fe3fe13acb7a34a5a517db9ccb2d Mon Sep 17 00:00:00 2001 From: Frederic Crozat <[email protected]> Date: Fri, 30 Sep 2011 13:55:31 +0000 -Subject: [PATCH] parse /etc/insserv.conf and adds dependencies accordingly +Subject: parse /etc/insserv.conf and adds dependencies accordingly (bnc#721428) --- @@ -9,10 +8,10 @@ 1 file changed, 104 insertions(+) diff --git a/src/core/service.c b/src/core/service.c -index cf0bbe0..471ce8d 100644 +index 3617c24..3c66cdb 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -3440,6 +3440,108 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { +@@ -3443,6 +3443,108 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { } #ifdef HAVE_SYSV_COMPAT @@ -121,7 +120,7 @@ static int service_enumerate(Manager *m) { char **p; -@@ -3600,6 +3702,8 @@ static int service_enumerate(Manager *m) { +@@ -3603,6 +3705,8 @@ static int service_enumerate(Manager *m) { r = 0; @@ -130,6 +129,3 @@ finish: for (i = 0; i < ELEMENTSOF(rcnd_table); i++) --- -1.8.1.4 - ++++++ remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -12,7 +12,7 @@ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/core/service.c b/src/core/service.c -index 5118b06..c13ff35 100644 +index a8b0d9d..c357b33 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -135,6 +135,7 @@ static void service_init(Unit *u) { @@ -68,7 +68,7 @@ s->guess_main_pid = false; s->restart = SERVICE_RESTART_NO; s->exec_context.ignore_sigpipe = false; -@@ -2074,7 +2104,7 @@ static void service_enter_running(Service *s, ServiceResult f) { +@@ -2077,7 +2107,7 @@ static void service_enter_running(Service *s, ServiceResult f) { if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && (s->bus_name_good || s->type != SERVICE_DBUS)) { #ifdef HAVE_SYSV_COMPAT @@ -78,7 +78,7 @@ #endif service_set_state(s, SERVICE_RUNNING); diff --git a/src/core/service.h b/src/core/service.h -index d1e53bf..4cd1a79 100644 +index 703d3fa..dc52e8c 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -176,6 +176,7 @@ struct Service { ++++++ restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch ++++++ --- /var/tmp/diff_new_pack.bBH85m/_old 2013-06-05 13:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bBH85m/_new 2013-06-05 13:16:25.000000000 +0200 @@ -11,10 +11,10 @@ create mode 100644 units/var-run.mount diff --git a/Makefile.am b/Makefile.am -index e82d092..38309a9 100644 +index 8730f66..b8cf696 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -406,6 +406,12 @@ dist_systemunit_DATA = \ +@@ -409,6 +409,12 @@ dist_systemunit_DATA = \ units/system-update.target \ units/initrd-switch-root.target @@ -27,7 +27,7 @@ nodist_systemunit_DATA = \ units/[email protected] \ units/[email protected] \ -@@ -4018,6 +4024,9 @@ RUNLEVEL4_TARGET_WANTS += \ +@@ -4058,6 +4064,9 @@ RUNLEVEL4_TARGET_WANTS += \ systemd-update-utmp-runlevel.service RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service ++++++ systemctl-does-not-expand-u-so-revert-back-to-I.patch ++++++ >From 9541fe6adff9941e487084c718ff2d46ed2929c6 Mon Sep 17 00:00:00 2001 From: Auke Kok <[email protected]> Date: Thu, 9 May 2013 09:39:15 -0700 Subject: [PATCH] systemctl does not expand %u, so revert back to %I The description field is only displayed by systemctl, and it can't expand %u properly (it will always display "root"). --- units/[email protected] | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/[email protected] b/units/[email protected] index 3cf1347..ece671d 100644 --- a/units/[email protected] +++ b/units/[email protected] @@ -6,7 +6,7 @@ # (at your option) any later version. [Unit] -Description=User Manager for %u +Description=User Manager for %I After=systemd-user-sessions.service [Service] -- 1.8.1.4 ++++++ systemd-202.tar.xz -> systemd-204.tar.xz ++++++ ++++ 43741 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
