Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-09-13 14:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-08 15:31:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-09-13 14:45:46.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Sep 13 07:47:40 UTC 2013 - fcro...@suse.com + +- Enable Predictable Network interface names (bnc#829526). + +------------------------------------------------------------------- +Fri Sep 13 03:14:36 UTC 2013 - crrodrig...@opensuse.org + +- version 207, distribution specific changes follow, for overall + release notes see NEWS. +- Fixed: + * Failed at step PAM spawning /usr/lib/systemd/systemd: + Operation not permitted + * Fix shutdown hang "a stop job is running for Session 1 of user root" + that was reported in opensuse-factory list. +- systemd-sysctl no longer reads /etc/sysctl.conf however backward + compatbility is to be provides by a symlink created at %post. +- removed previously disabled upstream patches (merged): + 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, +- removed upstream merged patches: + exclude-dev-from-tmpfiles.patch, + logind_update_state_file_after_generating_....patch +- Add systemd-pam_config.patch: use correct include name for PAM + configuration on openSUSE. + +------------------------------------------------------------------- +Mon Sep 9 14:39:46 UTC 2013 - fcro...@suse.com + +- Add exclude-dev-from-tmpfiles.patch: allow to exclude /dev from + tmpfiles (bnc#835813). + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-09-08 15:31:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-09-13 14:45:46.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Sep 13 07:47:40 UTC 2013 - fcro...@suse.com + +- Enable Predictable Network interface names (bnc#829526). + +------------------------------------------------------------------- +Fri Sep 13 03:14:36 UTC 2013 - crrodrig...@opensuse.org + +- version 207, distribution specific changes follow, for overall + release notes see NEWS. +- Fixed: + * Failed at step PAM spawning /usr/lib/systemd/systemd: + Operation not permitted + * Fix shutdown hang "a stop job is running for Session 1 of user root" + that was reported in opensuse-factory list. +- systemd-sysctl no longer reads /etc/sysctl.conf however backward + compatbility is to be provides by a symlink created at %post. +- removed previously disabled upstream patches (merged): + 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, +- removed upstream merged patches: + exclude-dev-from-tmpfiles.patch, + logind_update_state_file_after_generating_....patch +- Add systemd-pam_config.patch: use correct include name for PAM + configuration on openSUSE. + +------------------------------------------------------------------- +Mon Sep 9 14:39:46 UTC 2013 - fcro...@suse.com + +- Add exclude-dev-from-tmpfiles.patch: allow to exclude /dev from + tmpfiles (bnc#835813). + +------------------------------------------------------------------- Old: ---- 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 logind_update_state_file_after_generating_the_session_fifo_not_before.patch systemd-206.tar.xz New: ---- systemd-207.tar.xz systemd-pam_config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -25,7 +25,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 206 +Version: 207 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -155,7 +155,7 @@ Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcro...@suse.com -- Do not set anything beyond first dot as hostname Patch41: ensure-shortname-is-set-as-hostname-bnc-820213.patch - +Patch42: systemd-pam_config.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make @@ -170,8 +170,6 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidj...@gmail.com -- fix path to sulogin Patch46: use-usr-sbin-sulogin-for-emergency-service.patch -# PATCH-FIX-UPSTREAM logind_update_state_file_after_generating_the_session_fifo_not_before.patch -- fdo#67273 -Patch47: logind_update_state_file_after_generating_the_session_fifo_not_before.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -414,8 +412,8 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch46 -p1 -%patch47 -p1 # udev patches %patch1001 -p1 @@ -431,7 +429,6 @@ %build autoreconf -fiv - # prevent pre-generated and distributed files from re-building find . -name "*.[1-8]" -exec touch '{}' '+'; export V=1 @@ -593,11 +590,6 @@ %fdupes -s %{buildroot}%{_mandir} -# disable predictable network interface naming until it has been reviewed by network team -cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/network.conf -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 @@ -638,6 +630,12 @@ [ -f "$new_target" ] && ln -s -f $new_target $f || : done +# 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 + /bin/ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : +fi + %postun /sbin/ldconfig if [ $1 -ge 1 ]; then @@ -857,7 +855,9 @@ %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator %{_prefix}/lib/systemd/system-generators/systemd-insserv-generator +%{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator /%{_lib}/security/pam_systemd.so +/etc/pam.d/systemd-user %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d @@ -951,6 +951,9 @@ %dir /var/lib/systemd/migrated %dir /var/lib/systemd/catalog %dir /var/lib/systemd/coredump +%dir /usr/share/zsh +%dir /usr/share/zsh/site-functions +/usr/share/zsh/site-functions/* %files devel %defattr(-,root,root,-) ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -23,7 +23,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 206 +Version: 207 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -150,7 +150,7 @@ Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcro...@suse.com -- Do not set anything beyond first dot as hostname Patch41: ensure-shortname-is-set-as-hostname-bnc-820213.patch - +Patch42: systemd-pam_config.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make @@ -165,8 +165,6 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidj...@gmail.com -- fix path to sulogin Patch46: use-usr-sbin-sulogin-for-emergency-service.patch -# PATCH-FIX-UPSTREAM logind_update_state_file_after_generating_the_session_fifo_not_before.patch -- fdo#67273 -Patch47: logind_update_state_file_after_generating_the_session_fifo_not_before.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -409,8 +407,8 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch46 -p1 -%patch47 -p1 # udev patches %patch1001 -p1 @@ -426,7 +424,6 @@ %build autoreconf -fiv - # prevent pre-generated and distributed files from re-building find . -name "*.[1-8]" -exec touch '{}' '+'; export V=1 @@ -588,11 +585,6 @@ %fdupes -s %{buildroot}%{_mandir} -# disable predictable network interface naming until it has been reviewed by network team -cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/network.conf -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 @@ -633,6 +625,12 @@ [ -f "$new_target" ] && ln -s -f $new_target $f || : done +# 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 + /bin/ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : +fi + %postun /sbin/ldconfig if [ $1 -ge 1 ]; then @@ -852,7 +850,9 @@ %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator %{_prefix}/lib/systemd/system-generators/systemd-insserv-generator +%{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator /%{_lib}/security/pam_systemd.so +/etc/pam.d/systemd-user %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d @@ -946,6 +946,9 @@ %dir /var/lib/systemd/migrated %dir /var/lib/systemd/catalog %dir /var/lib/systemd/coredump +%dir /usr/share/zsh +%dir /usr/share/zsh/site-functions +/usr/share/zsh/site-functions/* %files devel %defattr(-,root,root,-) ++++++ Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -8,8 +8,8 @@ tmpfiles.d/legacy.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---- systemd-206.orig/tmpfiles.d/legacy.conf -+++ systemd-206/tmpfiles.d/legacy.conf +--- systemd-206_git201308300826.orig/tmpfiles.d/legacy.conf ++++ systemd-206_git201308300826/tmpfiles.d/legacy.conf @@ -10,12 +10,13 @@ # These files are considered legacy and are unnecessary on legacy-free # systems. ++++++ avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ src/nss-myhostname/nss-myhostname.c | 6 ++++++ 1 file changed, 6 insertions(+) ---- systemd-206.orig/src/nss-myhostname/nss-myhostname.c -+++ systemd-206/src/nss-myhostname/nss-myhostname.c +--- systemd-206_git201308300826.orig/src/nss-myhostname/nss-myhostname.c ++++ systemd-206_git201308300826/src/nss-myhostname/nss-myhostname.c @@ -442,6 +442,12 @@ enum nss_status _nss_myhostname_gethostb uint32_t local_address_ipv4 = LOCALADDRESS_IPV4; const char *canonical = NULL, *additional = NULL; ++++++ delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ units/systemd-f...@.service.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---- systemd-206.orig/src/cryptsetup/cryptsetup-generator.c -+++ systemd-206/src/cryptsetup/cryptsetup-generator.c +--- systemd-206_git201308300826.orig/src/cryptsetup/cryptsetup-generator.c ++++ systemd-206_git201308300826/src/cryptsetup/cryptsetup-generator.c @@ -160,6 +160,7 @@ static int create_disk( "Conflicts=umount.target\n" "DefaultDependencies=no\n" @@ -17,8 +17,8 @@ "After=systemd-readahead-collect.service systemd-readahead-replay.service\n", f); ---- systemd-206.orig/units/systemd-f...@.service.in -+++ systemd-206/units/systemd-f...@.service.in +--- systemd-206_git201308300826.orig/units/systemd-f...@.service.in ++++ systemd-206_git201308300826/units/systemd-f...@.service.in @@ -10,7 +10,7 @@ Description=File System Check on %f Documentation=man:systemd-fsck@.service(8) DefaultDependencies=no ++++++ ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -8,8 +8,8 @@ units/local-fs-pre.target | 1 + 1 file changed, 1 insertion(+) ---- systemd-206.orig/units/local-fs-pre.target -+++ systemd-206/units/local-fs-pre.target +--- systemd-206_git201308300826.orig/units/local-fs-pre.target ++++ systemd-206_git201308300826/units/local-fs-pre.target @@ -9,3 +9,4 @@ Description=Local File Systems (Pre) Documentation=man:systemd.special(7) ++++++ ensure-ask-password-wall-starts-after-getty-tty1.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ units/systemd-ask-password-wall.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- systemd-206.orig/units/systemd-ask-password-wall.service.in -+++ systemd-206/units/systemd-ask-password-wall.service.in +--- systemd-206_git201308300826.orig/units/systemd-ask-password-wall.service.in ++++ systemd-206_git201308300826/units/systemd-ask-password-wall.service.in @@ -8,7 +8,7 @@ [Unit] Description=Forward Password Requests to Wall ++++++ ensure-sysctl-are-applied-after-modules-are-loaded.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ units/systemd-sysctl.service.in | 1 + 1 file changed, 1 insertion(+) ---- systemd-206.orig/units/systemd-sysctl.service.in -+++ systemd-206/units/systemd-sysctl.service.in +--- systemd-206_git201308300826.orig/units/systemd-sysctl.service.in ++++ systemd-206_git201308300826/units/systemd-sysctl.service.in @@ -11,6 +11,7 @@ Documentation=man:systemd-sysctl.service DefaultDependencies=no Conflicts=shutdown.target @@ -16,4 +16,4 @@ +After=systemd-modules-load.service Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ - ConditionPathExists=|/etc/sysctl.conf + ConditionDirectoryNotEmpty=|/lib/sysctl.d ++++++ fix-owner-of-var-log-btmp.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ tmpfiles.d/systemd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- systemd-206.orig/tmpfiles.d/systemd.conf -+++ systemd-206/tmpfiles.d/systemd.conf +--- systemd-206_git201308300826.orig/tmpfiles.d/systemd.conf ++++ systemd-206_git201308300826/tmpfiles.d/systemd.conf @@ -11,7 +11,7 @@ d /run/user 0755 root root ~10d F /run/utmp 0664 root utmp - ++++++ fix-support-for-boot-prefixed-initscript-bnc-746506.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -6,9 +6,9 @@ src/systemctl/systemctl.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) ---- systemd-206.orig/src/systemctl/systemctl.c -+++ systemd-206/src/systemctl/systemctl.c -@@ -4238,8 +4238,28 @@ static int enable_sysv_units(char **args +--- systemd-206_git201308300826.orig/src/systemctl/systemctl.c ++++ systemd-206_git201308300826/src/systemctl/systemctl.c +@@ -4169,8 +4169,28 @@ static int enable_sysv_units(char **args p[strlen(p) - sizeof(".service") + 1] = 0; found_sysv = access(p, F_OK) >= 0; ++++++ handle-disable_caplock-and-compose_table-and-kbd_rate.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ src/vconsole/vconsole-setup.c | 156 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 3 deletions(-) ---- systemd-206.orig/src/vconsole/vconsole-setup.c -+++ systemd-206/src/vconsole/vconsole-setup.c +--- systemd-206_git201308300826.orig/src/vconsole/vconsole-setup.c ++++ systemd-206_git201308300826/src/vconsole/vconsole-setup.c @@ -40,6 +40,7 @@ #include "macro.h" #include "virt.h" ++++++ handle-numlock-value-in-etc-sysconfig-keyboard.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -6,8 +6,8 @@ Stanislav Brabec <sbra...@suse.cz> Cristian RodrÃguez <crrodrig...@opensuse.org> ---- systemd-206.orig/src/vconsole/vconsole-setup.c -+++ systemd-206/src/vconsole/vconsole-setup.c +--- systemd-206_git201308300826.orig/src/vconsole/vconsole-setup.c ++++ systemd-206_git201308300826/src/vconsole/vconsole-setup.c @@ -42,6 +42,10 @@ #include "fileio.h" #include "strv.h" @@ -98,9 +98,9 @@ #ifdef HAVE_SYSV_COMPAT free(vc_kbd_delay); free(vc_kbd_rate); ---- systemd-206.orig/Makefile.am -+++ systemd-206/Makefile.am -@@ -2452,6 +2452,19 @@ dist_udevrules_DATA += \ +--- systemd-206_git201308300826.orig/Makefile.am ++++ systemd-206_git201308300826/Makefile.am +@@ -2488,6 +2488,19 @@ dist_udevrules_DATA += \ rules/61-accelerometer.rules # ------------------------------------------------------------------------------ @@ -121,7 +121,7 @@ if ENABLE_GTK_DOC SUBDIRS += \ --- /dev/null -+++ systemd-206/rules/73-seat-numlock.rules ++++ systemd-206_git201308300826/rules/73-seat-numlock.rules @@ -0,0 +1,8 @@ +# This file is part of SUSE customization of systemd. +# @@ -132,7 +132,7 @@ + +SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}" --- /dev/null -+++ systemd-206/src/login/numlock-on.c ++++ systemd-206_git201308300826/src/login/numlock-on.c @@ -0,0 +1,34 @@ +/* + * numlock-on.c: Turn numlock-on @@ -168,8 +168,8 @@ + + exit(0); +} ---- systemd-206.orig/units/systemd-vconsole-setup.service.in -+++ systemd-206/units/systemd-vconsole-setup.service.in +--- systemd-206_git201308300826.orig/units/systemd-vconsole-setup.service.in ++++ systemd-206_git201308300826/units/systemd-vconsole-setup.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup DefaultDependencies=no Conflicts=shutdown.target ++++++ handle-root_uses_lang-value-in-etc-sysconfig-language.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,10 +7,10 @@ src/core/locale-setup.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) ---- systemd-206.orig/src/core/locale-setup.c -+++ systemd-206/src/core/locale-setup.c -@@ -70,6 +70,11 @@ static const char * const variable_names - int locale_setup(void) { +--- systemd-206_git201308300826.orig/src/core/locale-setup.c ++++ systemd-206_git201308300826/src/core/locale-setup.c +@@ -72,6 +72,11 @@ int locale_setup(char ***environment) { + char **env; char *variables[_VARIABLE_MAX] = {}; int r = 0, i; +#ifdef HAVE_SYSV_COMPAT @@ -21,7 +21,7 @@ if (detect_container(NULL) <= 0) { r = parse_env_file("/proc/cmdline", WHITESPACE, -@@ -116,6 +121,27 @@ int locale_setup(void) { +@@ -118,6 +123,27 @@ int locale_setup(char ***environment) { if (r < 0 && r != -ENOENT) log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); } @@ -48,4 +48,4 @@ +#endif for (i = 0; i < _VARIABLE_MAX; i++) { - if (variables[i]) { + if (!variables[i]) ++++++ insserv-generator.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -13,8 +13,8 @@ create mode 100644 src/insserv-generator/Makefile create mode 100644 src/insserv-generator/insserv-generator.c ---- systemd-206.orig/Makefile.am -+++ systemd-206/Makefile.am +--- systemd-206_git201308300826.orig/Makefile.am ++++ systemd-206_git201308300826/Makefile.am @@ -321,6 +321,7 @@ rootlibexec_PROGRAMS = \ systemd-sleep @@ -23,7 +23,7 @@ systemd-getty-generator \ systemd-fstab-generator \ systemd-system-update-generator -@@ -1642,6 +1643,14 @@ systemd_delta_LDADD = \ +@@ -1655,6 +1656,14 @@ systemd_delta_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -39,7 +39,7 @@ src/getty-generator/getty-generator.c --- /dev/null -+++ systemd-206/src/insserv-generator/Makefile ++++ systemd-206_git201308300826/src/insserv-generator/Makefile @@ -0,0 +1,28 @@ +# This file is part of systemd. +# @@ -70,7 +70,7 @@ + +.PHONY: all clean --- /dev/null -+++ systemd-206/src/insserv-generator/insserv-generator.c ++++ systemd-206_git201308300826/src/insserv-generator/insserv-generator.c @@ -0,0 +1,309 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + ++++++ module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,8 +7,8 @@ units/systemd-modules-load.service.in | 1 + 2 files changed, 27 insertions(+), 1 deletion(-) ---- systemd-206.orig/src/modules-load/modules-load.c -+++ systemd-206/src/modules-load/modules-load.c +--- systemd-206_git201308300826.orig/src/modules-load/modules-load.c ++++ systemd-206_git201308300826/src/modules-load/modules-load.c @@ -262,6 +262,9 @@ static int parse_argv(int argc, char *ar int main(int argc, char *argv[]) { int r, k; @@ -50,8 +50,8 @@ finish: kmod_unref(ctx); strv_free(arg_proc_cmdline_modules); ---- systemd-206.orig/units/systemd-modules-load.service.in -+++ systemd-206/units/systemd-modules-load.service.in +--- systemd-206_git201308300826.orig/units/systemd-modules-load.service.in ++++ systemd-206_git201308300826/units/systemd-modules-load.service.in @@ -13,6 +13,7 @@ Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target ++++++ optionally-warn-if-nss-myhostname-is-called.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -7,9 +7,9 @@ src/nss-myhostname/nss-myhostname.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) ---- systemd-206.orig/configure.ac -+++ systemd-206/configure.ac -@@ -803,6 +803,17 @@ if test "x$enable_myhostname" != "xno"; +--- systemd-206_git201308300826.orig/configure.ac ++++ systemd-206_git201308300826/configure.ac +@@ -817,6 +817,17 @@ if test "x$enable_myhostname" != "xno"; fi AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"]) @@ -27,8 +27,8 @@ # ------------------------------------------------------------------------------ AC_ARG_WITH(firmware-path, AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], ---- systemd-206.orig/src/nss-myhostname/nss-myhostname.c -+++ systemd-206/src/nss-myhostname/nss-myhostname.c +--- systemd-206_git201308300826.orig/src/nss-myhostname/nss-myhostname.c ++++ systemd-206_git201308300826/src/nss-myhostname/nss-myhostname.c @@ -29,6 +29,9 @@ #include <net/if.h> #include <stdlib.h> ++++++ remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -11,8 +11,8 @@ src/core/service.h | 1 + 2 files changed, 33 insertions(+), 2 deletions(-) ---- systemd-206.orig/src/core/service.c -+++ systemd-206/src/core/service.c +--- systemd-206_git201308300826.orig/src/core/service.c ++++ systemd-206_git201308300826/src/core/service.c @@ -135,6 +135,7 @@ static void service_init(Unit *u) { #ifdef HAVE_SYSV_COMPAT s->sysv_start_priority = -1; @@ -21,7 +21,7 @@ #endif s->socket_fd = -1; s->guess_main_pid = true; -@@ -877,6 +878,34 @@ static int service_load_sysv_path(Servic +@@ -879,6 +880,34 @@ static int service_load_sysv_path(Servic free(short_description); short_description = d; @@ -56,7 +56,7 @@ } else if (state == LSB_DESCRIPTION) { if (startswith(l, "#\t") || startswith(l, "# ")) { -@@ -927,7 +956,8 @@ static int service_load_sysv_path(Servic +@@ -929,7 +958,8 @@ static int service_load_sysv_path(Servic /* Special setting for all SysV services */ s->type = SERVICE_FORKING; @@ -66,7 +66,7 @@ s->guess_main_pid = false; s->restart = SERVICE_RESTART_NO; s->exec_context.ignore_sigpipe = false; -@@ -2094,7 +2124,7 @@ static void service_enter_running(Servic +@@ -2102,7 +2132,7 @@ static void service_enter_running(Servic if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && (s->bus_name_good || s->type != SERVICE_DBUS)) { #ifdef HAVE_SYSV_COMPAT @@ -75,8 +75,8 @@ s->remain_after_exit = false; #endif service_set_state(s, SERVICE_RUNNING); ---- systemd-206.orig/src/core/service.h -+++ systemd-206/src/core/service.h +--- systemd-206_git201308300826.orig/src/core/service.h ++++ systemd-206_git201308300826/src/core/service.h @@ -177,6 +177,7 @@ struct Service { bool is_sysv:1; bool sysv_has_lsb:1; ++++++ restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -10,9 +10,9 @@ create mode 100644 units/var-lock.mount create mode 100644 units/var-run.mount ---- systemd-206.orig/Makefile.am -+++ systemd-206/Makefile.am -@@ -407,6 +407,12 @@ dist_systemunit_DATA = \ +--- systemd-206_git201308300826.orig/Makefile.am ++++ systemd-206_git201308300826/Makefile.am +@@ -419,6 +419,12 @@ dist_systemunit_DATA = \ units/system-update.target \ units/initrd-switch-root.target @@ -25,7 +25,7 @@ nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ -@@ -4277,6 +4283,9 @@ RUNLEVEL4_TARGET_WANTS += \ +@@ -4379,6 +4385,9 @@ RUNLEVEL4_TARGET_WANTS += \ systemd-update-utmp-runlevel.service RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service @@ -36,7 +36,7 @@ SYSINIT_TARGET_WANTS += \ systemd-update-utmp.service --- /dev/null -+++ systemd-206/units/var-lock.mount ++++ systemd-206_git201308300826/units/var-lock.mount @@ -0,0 +1,19 @@ +# This file is part of systemd. +# @@ -58,7 +58,7 @@ +Type=bind +Options=bind --- /dev/null -+++ systemd-206/units/var-run.mount ++++ systemd-206_git201308300826/units/var-run.mount @@ -0,0 +1,19 @@ +# This file is part of systemd. +# ++++++ service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:48.000000000 +0200 @@ -12,9 +12,9 @@ src/core/service.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---- systemd-206.orig/src/core/service.c -+++ systemd-206/src/core/service.c -@@ -2092,8 +2092,13 @@ static void service_enter_running(Servic +--- systemd-206_git201308300826.orig/src/core/service.c ++++ systemd-206_git201308300826/src/core/service.c +@@ -2100,8 +2100,13 @@ static void service_enter_running(Servic cgroup_ok = cgroup_good(s); if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && ++++++ systemd-206.tar.xz -> systemd-207.tar.xz ++++++ ++++ 53817 lines of diff (skipped) ++++++ systemd-pam_config.patch ++++++ diff --git a/src/login/systemd-user b/src/login/systemd-user index 7b57dbf..c0fc793 100644 --- a/src/login/systemd-user +++ b/src/login/systemd-user @@ -2,7 +2,7 @@ # Used by systemd when launching systemd user instances. -account include system-auth -session include system-auth +account include common-account +session include common-session auth required pam_deny.so password required pam_deny.so ++++++ timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:49.000000000 +0200 @@ -6,8 +6,8 @@ src/timedate/timedated.c | 7 +++++++ 1 file changed, 7 insertions(+) ---- systemd-206.orig/src/timedate/timedated.c -+++ systemd-206/src/timedate/timedated.c +--- systemd-206_git201308300826.orig/src/timedate/timedated.c ++++ systemd-206_git201308300826/src/timedate/timedated.c @@ -182,6 +182,13 @@ static int read_data(void) { goto have_timezone; } ++++++ use-usr-sbin-sulogin-for-emergency-service.patch ++++++ --- /var/tmp/diff_new_pack.RP3aL1/_old 2013-09-13 14:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.RP3aL1/_new 2013-09-13 14:45:49.000000000 +0200 @@ -3,17 +3,6 @@ In current Factory sulogin is in /usr/sbin which makes it impossible to enter emergency service. ---- systemd-206.orig/units/emergency.service -+++ systemd-206/units/emergency.service -@@ -17,7 +17,7 @@ Environment=HOME=/root - WorkingDirectory=/root - ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' --ExecStart=-/sbin/sulogin -+ExecStart=-/usr/sbin/sulogin - ExecStopPost=/usr/bin/systemctl --fail --no-block default - Type=idle - StandardInput=tty-force --- systemd-206.orig/units/emergency.service.in +++ systemd-206/units/emergency.service.in @@ -17,7 +17,7 @@ Environment=HOME=/root -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
