Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-12-19 21:38:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Changes: -------- systemd-rpm-macros.changes: same change --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-12-19 12:51:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-12-19 21:39:01.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Dec 18 18:56:01 UTC 2013 - [email protected] + +- Added 0001-logind-garbage-collect-stale-users.patch: Don't stop a + running user manager from garbage-collecting the user. Original + behavior caused bnc#849870 + +------------------------------------------------------------------- +Mon Dec 16 11:08:33 UTC 2013 - [email protected] + +- Add build-sys-make-multi-seat-x-optional.patch + * See: http://cgit.freedesktop.org/systemd/systemd/commit/?id=bd441fa27a22b7c6e11d9330560e0622fb69f297 + * Now systemd-multi-seat-x build can be disabled with configure option + --disable-multi-seat-x. It should be done when xorg-x11-server + no longer needs it (work in progress). + +------------------------------------------------------------------- New: ---- 0001-logind-garbage-collect-stale-users.patch build-sys-make-multi-seat-x-optional.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.ZoJ2Ua/_old 2013-12-19 21:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ZoJ2Ua/_new 2013-12-19 21:39:02.000000000 +0100 @@ -244,6 +244,8 @@ Patch79: 0001-analyze-set-white-background.patch # PATCH-FIX-UPSTREAM 0001-analyze-set-text-on-side-with-most-space.patch [email protected] -- Place the text on the side with most space Patch80: 0001-analyze-set-text-on-side-with-most-space.patch +# PATCH-FIX-UPSTREAM 0001-logind-garbage-collect-stale-users.patch -- Don't stop a running user manager from garbage-collecting the user. +Patch81: 0001-logind-garbage-collect-stale-users.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -272,6 +274,8 @@ Patch1013: U_logind_revert_lazy_session_activation_on_non_vt_seats.patch # PATCH-FIX-OPENSUSE 1014-journald-with-journaling-FS.patch Patch1014: 1014-journald-with-journaling-FS.patch +# PATCH-FIX-UPSTREAM build-sys-make-multi-seat-x-optional.patch +Patch1015: build-sys-make-multi-seat-x-optional.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -534,6 +538,7 @@ %patch78 -p1 %patch79 -p1 %patch80 -p1 +%patch81 -p1 # udev patches %patch1001 -p1 @@ -552,6 +557,7 @@ %patch1012 -p1 %patch1013 -p1 %patch1014 -p1 +%patch1015 -p1 # ensure generate files are removed rm -f units/emergency.service ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.ZoJ2Ua/_old 2013-12-19 21:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ZoJ2Ua/_new 2013-12-19 21:39:02.000000000 +0100 @@ -239,6 +239,8 @@ Patch79: 0001-analyze-set-white-background.patch # PATCH-FIX-UPSTREAM 0001-analyze-set-text-on-side-with-most-space.patch [email protected] -- Place the text on the side with most space Patch80: 0001-analyze-set-text-on-side-with-most-space.patch +# PATCH-FIX-UPSTREAM 0001-logind-garbage-collect-stale-users.patch -- Don't stop a running user manager from garbage-collecting the user. +Patch81: 0001-logind-garbage-collect-stale-users.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -267,6 +269,8 @@ Patch1013: U_logind_revert_lazy_session_activation_on_non_vt_seats.patch # PATCH-FIX-OPENSUSE 1014-journald-with-journaling-FS.patch Patch1014: 1014-journald-with-journaling-FS.patch +# PATCH-FIX-UPSTREAM build-sys-make-multi-seat-x-optional.patch +Patch1015: build-sys-make-multi-seat-x-optional.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -529,6 +533,7 @@ %patch78 -p1 %patch79 -p1 %patch80 -p1 +%patch81 -p1 # udev patches %patch1001 -p1 @@ -547,6 +552,7 @@ %patch1012 -p1 %patch1013 -p1 %patch1014 -p1 +%patch1015 -p1 # ensure generate files are removed rm -f units/emergency.service ++++++ 0001-logind-garbage-collect-stale-users.patch ++++++ >From 63966da86d8e71b1f3f2b57d5448770d526421f9 Mon Sep 17 00:00:00 2001 From: Thomas Bächler <[email protected]> Date: Sun, 15 Dec 2013 11:06:37 +0000 Subject: login: Don't stop a running user manager from garbage-collecting the user. With the current logic, a user will never be garbage-collected, since its manager will always be around. Change the logic such that a user is garbage-collected when it has no sessions and linger is disabled. --- diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 6ba8d98..441e086 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not if (u->slice_job || u->service_job) return 1; - if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) - return 1; - - if (u->service && manager_unit_is_active(u->manager, u->service) != 0) - return 1; - return 0; } -- cgit v0.9.0.2-2-gbebe ++++++ 1014-journald-with-journaling-FS.patch ++++++ --- /var/tmp/diff_new_pack.ZoJ2Ua/_old 2013-12-19 21:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ZoJ2Ua/_new 2013-12-19 21:39:02.000000000 +0100 @@ -1,5 +1,5 @@ --- systemd-208/src/journal/journald-server.c -+++ systemd-208/src/journal/journald-server.c 2013-12-06 12:37:27.482735840 +0000 ++++ systemd-208/src/journal/journald-server.c 2013-12-10 16:31:50.770235717 +0000 @@ -21,6 +21,7 @@ #include <sys/signalfd.h> @@ -17,11 +17,12 @@ char *fn; sd_id128_t machine; char ids[33]; -@@ -905,7 +906,28 @@ static int system_journal_open(Server *s +@@ -905,7 +906,31 @@ static int system_journal_open(Server *s (void) mkdir("/var/log/journal/", 0755); fn = strappenda("/var/log/journal/", ids); - (void) mkdir(fn, 0755); ++ (void)mkdir(fn, 0755); + + /* + * On journaling and/or compressing file systems avoid doubling the @@ -29,18 +30,20 @@ + * Check for every single flag as otherwise some of the file systems + * may return EOPNOTSUPP on one unkown flag (like BtrFS does). + */ -+ if (mkdir(fn, 0755) == 0 && (fd = open(fn, O_DIRECTORY)) >= 0) { ++ if ((fd = open(fn, O_DIRECTORY)) >= 0) { + long flags; + if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == 0) { -+ if (ioctl(fd, FS_IOC_SETFLAGS, flags|FS_NOATIME_FL) == 0) ++ int old = flags; ++ if (!(flags&FS_NOATIME_FL) && ioctl(fd, FS_IOC_SETFLAGS, flags|FS_NOATIME_FL) == 0) + flags |= FS_NOATIME_FL; -+ if (ioctl(fd, FS_IOC_SETFLAGS, flags|FS_NOCOW_FL) == 0) ++ if (!(flags&FS_NOCOW_FL) && ioctl(fd, FS_IOC_SETFLAGS, flags|FS_NOCOW_FL) == 0) + flags |= FS_NOCOW_FL; -+ if (s->compress) { ++ if (!(flags&FS_NOCOMP_FL) && s->compress) { + flags &= ~FS_COMPR_FL; + flags |= FS_NOCOMP_FL; + } -+ ioctl(fd, FS_IOC_SETFLAGS, flags); ++ if (old != flags) ++ ioctl(fd, FS_IOC_SETFLAGS, flags); + } + close(fd); + } ++++++ build-sys-make-multi-seat-x-optional.patch ++++++ >From bd441fa27a22b7c6e11d9330560e0622fb69f297 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek <[email protected]> Date: Thu, 28 Nov 2013 17:07:29 +0000 Subject: build-sys: make multi-seat-x optional At some point it should become disabled by default. http://lists.freedesktop.org/archives/systemd-devel/2013-November/014869.html --- diff --git a/Makefile.am b/Makefile.am index 90874df..3598edd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4141,6 +4141,8 @@ MULTI_USER_TARGET_WANTS += \ SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service +if ENABLE_MULTI_SEAT_X + systemd_multi_seat_x_SOURCES = \ src/login/multi-seat-x.c @@ -4151,6 +4153,8 @@ systemd_multi_seat_x_LDADD = \ rootlibexec_PROGRAMS += \ systemd-multi-seat-x +endif + dist_udevrules_DATA += \ src/login/70-uaccess.rules \ src/login/70-power-switch.rules diff --git a/configure.ac b/configure.ac index f1b00c5..ab24266 100644 --- a/configure.ac +++ b/configure.ac @@ -794,6 +794,14 @@ fi AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) # ------------------------------------------------------------------------------ +have_multi_seat_x=no +AC_ARG_ENABLE(multi_seat_x, AS_HELP_STRING([--disable-multi-seat-x], [do not build multi-seat-x])) +if test "x$enable_multi_seat_x" != "xno"; then + have_multi_seat_x=yes +fi +AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"]) + +# ------------------------------------------------------------------------------ AC_ARG_WITH(rc-local-script-path-start, AS_HELP_STRING([--with-rc-local-script-path-start=PATH], [Path to /etc/rc.local]), @@ -1077,6 +1085,7 @@ AC_MSG_RESULT([ nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} gintrospection: ${enable_introspection} + multi-seat-x: ${have_multi_seat_x} Python: ${have_python} Python Headers: ${have_python_devel} man pages: ${have_manpages} -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
