Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-12-10 14:28:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2012-11-26 20:01:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2012-12-10 14:28:41.000000000 +0100 @@ -1,0 +2,23 @@ +Thu Dec 6 22:47:09 UTC 2012 - [email protected] + +- revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch: + do not consider failure to umount / and /usr an error. + +------------------------------------------------------------------- +Wed Dec 5 15:13:27 UTC 2012 - [email protected] + +- Add fix-devname-prefix.patch: fix modules.devname path, it isn't + in /usr. +- Move post script to fix symlinks in /etc/systemd/system to a + trigger to run it after old systemd is uninstalled. + +------------------------------------------------------------------- +Tue Dec 4 16:51:32 UTC 2012 - [email protected] + +- Add fix-debugshell.patch: use /bin/bash if sushell isn't + installed (bnc#789052). +- Add handle-root-uses-lang.patch: handle ROOT_USES_LANG=ctype + (bnc#792182). +- Ensure libudev1 and libudev-mini1 conflicts. + +------------------------------------------------------------------- systemd.changes: same change New: ---- fix-debugshell.patch fix-devname-prefix.patch handle-root-uses-lang.patch revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.9UimFL/_old 2012-12-10 14:28:43.000000000 +0100 +++ /var/tmp/diff_new_pack.9UimFL/_new 2012-12-10 14:28:43.000000000 +0100 @@ -131,6 +131,10 @@ Patch60: var-run-lock.patch Patch63: xdm-display-manager.patch Patch64: fix-permissions-btmp.patch +# PATCH-FIX-UPSTREAM fix-debugshell.patch [email protected] bnc#789052 -- use bash if sushell isn't available +Patch71: fix-debugshell.patch +# PATCH-FIX-OPENSUSE handle-root-uses-lang.patch bnc#792182 [email protected] -- handle ROOT_USES_LANG=ctype +Patch72: handle-root-uses-lang.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -152,6 +156,8 @@ Patch69: switch-root-try-pivot-root.patch # PATCH-FIX-UPSTREAM remount-ro-before-unmount.patch [email protected] -- remount ro before unmounting in final shutdown loop Patch70: remount-ro-before-unmount.patch +# PATCH-FIX-UPSTREAM revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch [email protected] -- do not consider failure to umount / and /usr an error. +Patch73: revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -165,6 +171,8 @@ Patch1026: 0026-udev-netlink-null-rules.patch # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch +# PATCH-FIX-OPENSUSE fix-devname-prefix.patch [email protected] -- fix modules.devname path, it isn't in /usr +Patch1028: fix-devname-prefix.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -247,6 +255,9 @@ License: LGPL-2.1+ Group: System/Libraries Requires: %{udevpkgname} >= %{version}-%{release} +%if 0%{?bootstrap} +Conflicts: libudev%{udev_major} +%endif %description -n lib%{udevpkgname}%{udev_major} This package contains the dynamic library libudev, which provides @@ -325,6 +336,7 @@ %patch1014 -p1 %patch1026 -p1 %patch1027 -p1 +%patch1028 -p1 #systemd %patch1 -p1 @@ -359,6 +371,9 @@ %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 %build autoreconf -fiv @@ -518,15 +533,15 @@ systemd-readahead-collect.service \ systemd-readahead-replay.service \ remote-fs.target >/dev/null 2>&1 || : -else +fi + +%triggerpostun -- systemd < 194 # migrate any symlink which may refer to the old path for f in $(find /etc/systemd/system -type l -xtype l); do new_target="/usr$(readlink $f)" [ -f "$new_target" ] && ln -s -f $new_target $f || : done -fi - %postun /sbin/ldconfig if [ $1 -ge 1 ]; then ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.9UimFL/_old 2012-12-10 14:28:43.000000000 +0100 +++ /var/tmp/diff_new_pack.9UimFL/_new 2012-12-10 14:28:43.000000000 +0100 @@ -126,6 +126,10 @@ Patch60: var-run-lock.patch Patch63: xdm-display-manager.patch Patch64: fix-permissions-btmp.patch +# PATCH-FIX-UPSTREAM fix-debugshell.patch [email protected] bnc#789052 -- use bash if sushell isn't available +Patch71: fix-debugshell.patch +# PATCH-FIX-OPENSUSE handle-root-uses-lang.patch bnc#792182 [email protected] -- handle ROOT_USES_LANG=ctype +Patch72: handle-root-uses-lang.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -147,6 +151,8 @@ Patch69: switch-root-try-pivot-root.patch # PATCH-FIX-UPSTREAM remount-ro-before-unmount.patch [email protected] -- remount ro before unmounting in final shutdown loop Patch70: remount-ro-before-unmount.patch +# PATCH-FIX-UPSTREAM revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch [email protected] -- do not consider failure to umount / and /usr an error. +Patch73: revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -160,6 +166,8 @@ Patch1026: 0026-udev-netlink-null-rules.patch # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch +# PATCH-FIX-OPENSUSE fix-devname-prefix.patch [email protected] -- fix modules.devname path, it isn't in /usr +Patch1028: fix-devname-prefix.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -242,6 +250,9 @@ License: LGPL-2.1+ Group: System/Libraries Requires: %{udevpkgname} >= %{version}-%{release} +%if 0%{?bootstrap} +Conflicts: libudev%{udev_major} +%endif %description -n lib%{udevpkgname}%{udev_major} This package contains the dynamic library libudev, which provides @@ -320,6 +331,7 @@ %patch1014 -p1 %patch1026 -p1 %patch1027 -p1 +%patch1028 -p1 #systemd %patch1 -p1 @@ -354,6 +366,9 @@ %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 %build autoreconf -fiv @@ -513,15 +528,15 @@ systemd-readahead-collect.service \ systemd-readahead-replay.service \ remote-fs.target >/dev/null 2>&1 || : -else +fi + +%triggerpostun -- systemd < 194 # migrate any symlink which may refer to the old path for f in $(find /etc/systemd/system -type l -xtype l); do new_target="/usr$(readlink $f)" [ -f "$new_target" ] && ln -s -f $new_target $f || : done -fi - %postun /sbin/ldconfig if [ $1 -ge 1 ]; then ++++++ fix-debugshell.patch ++++++ Index: systemd-195/units/debug-shell.service.in =================================================================== --- systemd-195.orig/units/debug-shell.service.in +++ systemd-195/units/debug-shell.service.in @@ -13,7 +13,7 @@ IgnoreOnIsolate=yes [Service] Environment=TERM=linux -ExecStart=@sushell@ +ExecStart=/bin/bash -c '[ -x @sushell@ ] && exec @sushell@ || exec /bin/bash' Restart=always RestartSec=0 StandardInput=tty ++++++ fix-devname-prefix.patch ++++++ Index: systemd-195/src/udev/udevd.c =================================================================== --- systemd-195.orig/src/udev/udevd.c +++ systemd-195/src/udev/udevd.c @@ -820,7 +820,7 @@ static void static_dev_create_from_modul FILE *f; uname(&kernel); - util_strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL); + util_strscpyl(modules, sizeof(modules), "/lib/modules/", kernel.release, "/modules.devname", NULL); f = fopen(modules, "re"); if (f == NULL) return; ++++++ handle-root-uses-lang.patch ++++++ Index: systemd-195/src/core/locale-setup.c =================================================================== --- systemd-195.orig/src/core/locale-setup.c +++ systemd-195/src/core/locale-setup.c @@ -69,6 +69,11 @@ static const char * const variable_names int locale_setup(void) { char *variables[_VARIABLE_MAX]; int r = 0, i; +#if defined(TARGET_SUSE) + char *root_uses_lang; + + zero(root_uses_lang); +#endif zero(variables); @@ -134,11 +139,21 @@ int locale_setup(void) { #elif defined(TARGET_SUSE) if (r <= 0 && (r = parse_env_file("/etc/sysconfig/language", NEWLINE, + "ROOT_USES_LANG", &root_uses_lang, "RC_LANG", &variables[VARIABLE_LANG], NULL)) < 0) { if (r != -ENOENT) log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r)); + } else { + if (!root_uses_lang || root_uses_lang && strcasecmp(root_uses_lang,"yes") != 0) { + if (root_uses_lang && strcasecmp(root_uses_lang,"ctype") == 0) + variables[VARIABLE_LC_CTYPE]=variables[VARIABLE_LANG]; + else + free(variables[VARIABLE_LANG]); + + variables[VARIABLE_LANG]=strdup("POSIX"); + } } #elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) @@ -247,5 +262,9 @@ finish: for (i = 0; i < _VARIABLE_MAX; i++) free(variables[i]); +#if defined(TARGET_SUSE) + free(root_uses_lang); +#endif + return r; } ++++++ revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch ++++++ commit 140883405e429d9f8d3480a2701d8904f97e4a98 Author: Tom Gundersen <[email protected]> Date: Wed Nov 28 18:08:54 2012 +0100 shutdown: don't consider umounting of / and /usr failed In the words of Homer: If you don't try, you can't fail. This is a revert of 9279749b84cc87c7830280b7895a48bed03c9429. It used to be necessary to consider the umounting failed to make sure / and /usr were remounted read-only, but that is no longer necessary as everything is now remounted read-only anyway. Moreover, this avoids a warning at shutdown saying a filesystem was not unmounted. As the umounting of / is never attempted there was no corresponding warning message saying which fs that failed. This caused some spurious bug-reports from concerned users. Cc: Michael Biebl <[email protected]> diff --git a/src/core/umount.c b/src/core/umount.c index e794057..5989a4c 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -433,15 +433,14 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e } /* Skip / and /usr since we cannot unmount that - * anyway, since we are running from it */ + * anyway, since we are running from it. They have already been + * remounte ro. */ if (path_equal(m->path, "/") #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif - ) { - n_failed++; + ) continue; - } /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */ if (umount2(m->path, MNT_FORCE) == 0) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
