[systemd/f19] Backport two more patches

[Zbigniew Jędrzejewski-Szmek]

commit 7a9827405218f987a7cea60849b486acbe1b3126
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Sep 17 11:00:47 2013 -0500

    Backport two more patches

 ...rnal-correctly-convert-usec_t-to-timespec.patch |    2 +-
 ...hon-do-not-attempt-to-convert-str-to-byte.patch |    2 +-
 0003-systemd-python-fix-iteration.patch            |    2 +-
 ...systemctl-honor-no-legend-in-list-sockets.patch |    2 +-
 ...l-processes-with-SIGKILL-on-watchdog-fail.patch |    2 +-
 0006-Fix-CPUShares-configuration-option.patch      |    2 +-
 ...-recalculate-the-ACL-mask-but-only-if-it-.patch |    2 +-
 ...-t-report-alien-child-as-alive-when-it-s-.patch |    2 +-
 ...ember-last-direction-of-search-and-keep-o.patch |    2 +-
 0010-journal-letting-interleaved-seqnums-go.patch  |    2 +-
 ...rs-always-call-kmod-even-when-a-driver-is.patch |    2 +-
 ...-slot.rules-only-rename-network-interface.patch |    2 +-
 0013-journal-fix-hashmap-leak-in-mmap-cache.patch  |    2 +-
 ...ator-read-rd.fstab-on-off-switch-correctl.patch |    2 +-
 ...nerator-log_oom-if-automount_name-is-null.patch |    2 +-
 ...-not-overwrite-syslog-facility-when-parsi.patch |    2 +-
 ...ix-parsing-of-facility-in-syslog-messages.patch |    2 +-
 ...budev-fix-memleak-when-enumerating-childs.patch |    2 +-
 ...merate-fix-NULL-deref-for-subsystem-match.patch |    2 +-
 ...edump-Ignore-coredumps-larger-than-COREDU.patch |    2 +-
 0021-journalctl-use-_COMM-match-for-scripts.patch  |    2 +-
 0022-Allow-tabs-in-environment-files.patch         |    2 +-
 ...-Actually-allow-tabs-in-environment-files.patch |    2 +-
 ...rocess-only-signals-for-jobs-we-really-wa.patch |    2 +-
 0025-cgtop-fixup-the-online-help.patch             |    2 +-
 0026-man-fix-description-of-sysctl.d-order.patch   |   28 ++++++++++
 ....c-do-not-point-users-to-logs-when-unit-n.patch |   58 ++++++++++++++++++++
 systemd.spec                                       |    5 ++-
 28 files changed, 115 insertions(+), 26 deletions(-)
---
diff --git a/0001-journal-correctly-convert-usec_t-to-timespec.patch b/0001-journal-correctly-convert-usec_t-to-timespec.patch
index dbc4711..d256838 100644
--- a/0001-journal-correctly-convert-usec_t-to-timespec.patch
+++ b/0001-journal-correctly-convert-usec_t-to-timespec.patch
@@ -1,7 +1,7 @@
 From 11fe664c24617569d1088fae7c6630718fbf1896 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20Bartoszkiewicz?= <mbartoszkiewicz at gmail.com>
 Date: Wed, 15 May 2013 11:28:58 +0200
-Subject: [PATCH 01/25] journal: correctly convert usec_t to timespec.
+Subject: [PATCH 01/27] journal: correctly convert usec_t to timespec.
 
 Use timespec_store instead of (incorrectly) doing it inline.
 ---
diff --git a/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch b/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
index 67adce1..743090d 100644
--- a/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
+++ b/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
@@ -1,7 +1,7 @@
 From 67cbbab20c41dd3a7908bc9e50f56ce3ee607bf7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 16 May 2013 00:38:39 -0400
-Subject: [PATCH 02/25] systemd-python: do not attempt to convert str to bytes
+Subject: [PATCH 02/27] systemd-python: do not attempt to convert str to bytes
 
 Bug-spotted-by: Steven Hiscocks <steven-systemd at hiscocks.me.uk>
 ---
diff --git a/0003-systemd-python-fix-iteration.patch b/0003-systemd-python-fix-iteration.patch
index 49fa7d9..7895855 100644
--- a/0003-systemd-python-fix-iteration.patch
+++ b/0003-systemd-python-fix-iteration.patch
@@ -1,7 +1,7 @@
 From 451cbd3ce291b2e3205461068899bb55d7dcd9d4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Wed, 17 Jul 2013 12:50:43 -0400
-Subject: [PATCH 03/25] systemd-python: fix iteration
+Subject: [PATCH 03/27] systemd-python: fix iteration
 
 Back in 6a58bf4135 raising stop iteration was removed from the C
 code, but wasn't added in the Python counterpart.
diff --git a/0004-systemctl-honor-no-legend-in-list-sockets.patch b/0004-systemctl-honor-no-legend-in-list-sockets.patch
index a5145a6..94a0a9a 100644
--- a/0004-systemctl-honor-no-legend-in-list-sockets.patch
+++ b/0004-systemctl-honor-no-legend-in-list-sockets.patch
@@ -1,7 +1,7 @@
 From 416783827045e646f8c104aa9a0719e738f53ca6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity at gmail.com>
 Date: Mon, 20 May 2013 11:20:15 +0300
-Subject: [PATCH 04/25] systemctl: honor "--no-legend" in 'list-sockets'
+Subject: [PATCH 04/27] systemctl: honor "--no-legend" in 'list-sockets'
 
 ---
  src/systemctl/systemctl.c | 22 +++++++++++++---------
diff --git a/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch b/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
index aee3357..0fe5cff 100644
--- a/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
+++ b/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
@@ -1,7 +1,7 @@
 From 1edd8011c0a9452d4f384551f06dd0c5f480c60f Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich at pengutronix.de>
 Date: Sun, 19 May 2013 12:10:55 +0200
-Subject: [PATCH 05/25] service: kill processes with SIGKILL on watchdog
+Subject: [PATCH 05/27] service: kill processes with SIGKILL on watchdog
  failure
 
 Just calling service_enter_dead() does not kill any processes.
diff --git a/0006-Fix-CPUShares-configuration-option.patch b/0006-Fix-CPUShares-configuration-option.patch
index f2c9371..2434b5b 100644
--- a/0006-Fix-CPUShares-configuration-option.patch
+++ b/0006-Fix-CPUShares-configuration-option.patch
@@ -1,7 +1,7 @@
 From 099027082347d4c366d1f72e9e23d1939914d7bf Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra at logicblox.com>
 Date: Fri, 24 May 2013 13:34:53 -0400
-Subject: [PATCH 06/25] Fix CPUShares configuration option
+Subject: [PATCH 06/27] Fix CPUShares configuration option
 
 This fixes the error message "Unknown or unsupported cgroup attribute
 CPUShares".
diff --git a/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
index 82d52f8..a531196 100644
--- a/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
+++ b/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
@@ -1,7 +1,7 @@
 From b2923bfc88c874b303efa86f51a53ba0a31f5aaa Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 28 May 2013 20:45:34 +0200
-Subject: [PATCH 07/25] journald: DO recalculate the ACL mask, but only if it
+Subject: [PATCH 07/27] journald: DO recalculate the ACL mask, but only if it
  doesn't exist
 
 Since 11ec7ce, journald isn't setting the ACLs properly anymore if
diff --git a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
index f9bf8df..e14d1a6 100644
--- a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
+++ b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
@@ -1,7 +1,7 @@
 From 184c94de2cd85228b729dac1fb5f59453cfbbbed Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <rosslagerwall at gmail.com>
 Date: Sun, 9 Jun 2013 17:28:44 +0100
-Subject: [PATCH 08/25] service: don't report alien child as alive when it's
+Subject: [PATCH 08/27] service: don't report alien child as alive when it's
  not
 
 When a sigchld is received from an alien child, main_pid is set to
diff --git a/0009-journal-remember-last-direction-of-search-and-keep-o.patch b/0009-journal-remember-last-direction-of-search-and-keep-o.patch
index 0eb598d..bbfbcdf 100644
--- a/0009-journal-remember-last-direction-of-search-and-keep-o.patch
+++ b/0009-journal-remember-last-direction-of-search-and-keep-o.patch
@@ -1,7 +1,7 @@
 From c17f7d8a60e17af4abb63668756f9237db3b9634 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 6 Jun 2013 22:28:05 -0400
-Subject: [PATCH 09/25] journal: remember last direction of search and keep
+Subject: [PATCH 09/27] journal: remember last direction of search and keep
  offset cache
 
 The fields in JournalFile are moved around to avoid wasting
diff --git a/0010-journal-letting-interleaved-seqnums-go.patch b/0010-journal-letting-interleaved-seqnums-go.patch
index 6fe13d6..fdd0c82 100644
--- a/0010-journal-letting-interleaved-seqnums-go.patch
+++ b/0010-journal-letting-interleaved-seqnums-go.patch
@@ -1,7 +1,7 @@
 From 0bad6bf0e0c53e68bc41dd011ad22d4672de56eb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 7 Jun 2013 22:01:03 -0400
-Subject: [PATCH 10/25] journal: letting (interleaved) seqnums go
+Subject: [PATCH 10/27] journal: letting (interleaved) seqnums go
 
 In the following scenario:
   server creates system.journal
diff --git a/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch b/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
index 6686b2e..368ac15 100644
--- a/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
+++ b/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
@@ -1,7 +1,7 @@
 From 59eb9113f522703d80f2904c81825e4a165bb050 Mon Sep 17 00:00:00 2001
 From: Kay Sievers <kay at vrfy.org>
 Date: Sat, 20 Jul 2013 14:29:12 +0200
-Subject: [PATCH 11/25] rules: drivers - always call kmod, even when a driver
+Subject: [PATCH 11/27] rules: drivers - always call kmod, even when a driver
  is bound to the device
 
 On Sat, Jul 20, 2013 at 12:56 PM, Rafael J. Wysocki <rjw at sisk.pl> wrote:
diff --git a/0012-80-net-name-slot.rules-only-rename-network-interface.patch b/0012-80-net-name-slot.rules-only-rename-network-interface.patch
index c269469..72aa308 100644
--- a/0012-80-net-name-slot.rules-only-rename-network-interface.patch
+++ b/0012-80-net-name-slot.rules-only-rename-network-interface.patch
@@ -1,7 +1,7 @@
 From 33e3e7fbcce582c26604d997df89e71908ac7999 Mon Sep 17 00:00:00 2001
 From: Harald Hoyer <harald at redhat.com>
 Date: Thu, 1 Aug 2013 12:31:38 +0200
-Subject: [PATCH 12/25] 80-net-name-slot.rules: only rename network interfaces
+Subject: [PATCH 12/27] 80-net-name-slot.rules: only rename network interfaces
  on ACTION=="add"
 
 Otherwise systemd-udevd will rename on "change" and "move" events,
diff --git a/0013-journal-fix-hashmap-leak-in-mmap-cache.patch b/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
index e0068a9..c040dd5 100644
--- a/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
+++ b/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
@@ -1,7 +1,7 @@
 From 812882be86dcb30b2ab6e7f95dfcd393d972c781 Mon Sep 17 00:00:00 2001
 From: George McCollister <george.mccollister at gmail.com>
 Date: Thu, 1 Aug 2013 12:40:01 -0500
-Subject: [PATCH 13/25] journal: fix hashmap leak in mmap-cache
+Subject: [PATCH 13/27] journal: fix hashmap leak in mmap-cache
 
 hashmap_free() wasn't being called on m->contexts and m->fds resulting
 in a leak.
diff --git a/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch b/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
index 4e3a099..465bcba 100644
--- a/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
+++ b/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
@@ -1,7 +1,7 @@
 From b09b841398cccd3794b9573d57828e810f5f33cb Mon Sep 17 00:00:00 2001
 From: WANG Chao <chaowang at redhat.com>
 Date: Fri, 9 Aug 2013 17:01:50 +0800
-Subject: [PATCH 14/25] fstab-generator: read rd.fstab=on/off switch correctly
+Subject: [PATCH 14/27] fstab-generator: read rd.fstab=on/off switch correctly
 
 ---
  src/fstab-generator/fstab-generator.c | 4 ++--
diff --git a/0015-fstab-generator-log_oom-if-automount_name-is-null.patch b/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
index a6fc5a7..aee7d73 100644
--- a/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
+++ b/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
@@ -1,7 +1,7 @@
 From 591e3ca379b32a65aea20f84fba3f88dd0f85f9b Mon Sep 17 00:00:00 2001
 From: WANG Chao <chaowang at redhat.com>
 Date: Tue, 13 Aug 2013 16:38:19 +0800
-Subject: [PATCH 15/25] fstab-generator: log_oom() if automount_name is null
+Subject: [PATCH 15/27] fstab-generator: log_oom() if automount_name is null
 
 ---
  src/fstab-generator/fstab-generator.c | 2 +-
diff --git a/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch b/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
index 6dc2f58..f622a89 100644
--- a/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
+++ b/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
@@ -1,7 +1,7 @@
 From 9331382dd5caabd748d8fc28a0bc2a087ed8f9a8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Mon, 10 Jun 2013 18:10:12 -0400
-Subject: [PATCH 16/25] journald: do not overwrite syslog facility when parsing
+Subject: [PATCH 16/27] journald: do not overwrite syslog facility when parsing
  priority
 
 https://bugs.freedesktop.org/show_bug.cgi?id=65610
diff --git a/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch b/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
index bca665e..89653cb 100644
--- a/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
+++ b/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
@@ -1,7 +1,7 @@
 From 5ca24e3f6deaba05049e4b0e4d8cea8a31f9eea0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 26 Jul 2013 12:57:33 -0400
-Subject: [PATCH 17/25] journal: fix parsing of facility in syslog messages
+Subject: [PATCH 17/27] journal: fix parsing of facility in syslog messages
 
 In 49998b383 (journald: do not overwrite syslog facility when
 parsing priority) journald started ignoring facility part when
diff --git a/0018-libudev-fix-memleak-when-enumerating-childs.patch b/0018-libudev-fix-memleak-when-enumerating-childs.patch
index db20344..c1c4066 100644
--- a/0018-libudev-fix-memleak-when-enumerating-childs.patch
+++ b/0018-libudev-fix-memleak-when-enumerating-childs.patch
@@ -1,7 +1,7 @@
 From fa74dedd21c2c64dc6cf20f49be9db32d909db74 Mon Sep 17 00:00:00 2001
 From: David Herrmann <dh.herrmann at gmail.com>
 Date: Wed, 4 Sep 2013 12:36:19 +0200
-Subject: [PATCH 18/25] libudev: fix memleak when enumerating childs
+Subject: [PATCH 18/27] libudev: fix memleak when enumerating childs
 
 We need to free udev-devices again if they don't match. Funny that no-one
 noticed it yet since valgrind is quite verbose about it.
diff --git a/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch b/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
index 601e5cb..1d9fbde 100644
--- a/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
+++ b/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
@@ -1,7 +1,7 @@
 From 0006eedfd2596b69a6d62e0ae6ec7cfeec20ce0c Mon Sep 17 00:00:00 2001
 From: David Herrmann <dh.herrmann at gmail.com>
 Date: Fri, 30 Aug 2013 15:50:41 +0200
-Subject: [PATCH 19/25] libudev: enumerate: fix NULL-deref for
+Subject: [PATCH 19/27] libudev: enumerate: fix NULL-deref for
  subsystem-matches
 
 udev_device_get_subsystem() may return NULL if no subsystem could be
diff --git a/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch b/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
index 9463ac7..2cb271e 100644
--- a/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
+++ b/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
@@ -1,7 +1,7 @@
 From 27b1a19a3c1c42a3af0d3970ca5b5cb5b24c7254 Mon Sep 17 00:00:00 2001
 From: Andrew Cook <ariscop at gmail.com>
 Date: Wed, 4 Sep 2013 23:27:40 +1000
-Subject: [PATCH 20/25] systemd-coredump: Ignore coredumps larger than
+Subject: [PATCH 20/27] systemd-coredump: Ignore coredumps larger than
  COREDUMP_MAX
 
 Currently this check happens when the coredump has been collected in
diff --git a/0021-journalctl-use-_COMM-match-for-scripts.patch b/0021-journalctl-use-_COMM-match-for-scripts.patch
index 0105339..ad9203b 100644
--- a/0021-journalctl-use-_COMM-match-for-scripts.patch
+++ b/0021-journalctl-use-_COMM-match-for-scripts.patch
@@ -1,7 +1,7 @@
 From 7d3f06fa516a0eacad9ca9a17c433ca7e4f5876a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 19 Jul 2013 04:02:50 -0400
-Subject: [PATCH 21/25] journalctl: use _COMM= match for scripts
+Subject: [PATCH 21/27] journalctl: use _COMM= match for scripts
 
 In case of scripts, _EXE is set to the interpreter name, and
 _COMM is set based on the file name. Add a match for _COMM,
diff --git a/0022-Allow-tabs-in-environment-files.patch b/0022-Allow-tabs-in-environment-files.patch
index 9ea72e0..cac3f66 100644
--- a/0022-Allow-tabs-in-environment-files.patch
+++ b/0022-Allow-tabs-in-environment-files.patch
@@ -1,7 +1,7 @@
 From c884f73cb754db77632a84830e5a058827d732e5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Wed, 11 Sep 2013 21:50:16 -0400
-Subject: [PATCH 22/25] Allow tabs in environment files
+Subject: [PATCH 22/27] Allow tabs in environment files
 
 bash allows them, and so should we.
 
diff --git a/0023-Actually-allow-tabs-in-environment-files.patch b/0023-Actually-allow-tabs-in-environment-files.patch
index cf02d65..65007c7 100644
--- a/0023-Actually-allow-tabs-in-environment-files.patch
+++ b/0023-Actually-allow-tabs-in-environment-files.patch
@@ -1,7 +1,7 @@
 From f3e54e0678ed5cf42ce21ef83cf4640889db1f5d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 12 Sep 2013 10:03:16 -0400
-Subject: [PATCH 23/25] Actually allow tabs in environment files
+Subject: [PATCH 23/27] Actually allow tabs in environment files
 
 Fixup for ac4c8d6da8b5e.
 ---
diff --git a/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch b/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
index 19959f9..d1f116f 100644
--- a/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
+++ b/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
@@ -1,7 +1,7 @@
 From 90c6172bd8c7e40cba714737f5a5f5364dc56084 Mon Sep 17 00:00:00 2001
 From: Michal Sekletar <msekleta at redhat.com>
 Date: Thu, 12 Sep 2013 15:42:24 +0200
-Subject: [PATCH 24/25] systemctl: process only signals for jobs we really wait
+Subject: [PATCH 24/27] systemctl: process only signals for jobs we really wait
  for
 
 wait_filter() callback shouldn't process JobRemove signals for arbitrary
diff --git a/0025-cgtop-fixup-the-online-help.patch b/0025-cgtop-fixup-the-online-help.patch
index 0559872..141ae3e 100644
--- a/0025-cgtop-fixup-the-online-help.patch
+++ b/0025-cgtop-fixup-the-online-help.patch
@@ -1,7 +1,7 @@
 From fc9783ea51072f062a98f1541481355bac3aee3b Mon Sep 17 00:00:00 2001
 From: Brandon Philips <brandon at ifup.co>
 Date: Tue, 3 Sep 2013 21:34:02 -0700
-Subject: [PATCH 25/25] cgtop: fixup the online help
+Subject: [PATCH 25/27] cgtop: fixup the online help
 
 The online help shows the keys as uppercase but the code and manpage say
 lower case. Make the online help follow reality.
diff --git a/0026-man-fix-description-of-sysctl.d-order.patch b/0026-man-fix-description-of-sysctl.d-order.patch
new file mode 100644
index 0000000..282862c
--- /dev/null
+++ b/0026-man-fix-description-of-sysctl.d-order.patch
@@ -0,0 +1,28 @@
+From 69ade6b46e1e567bc729f0fa10afa23aa8940072 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity at gmail.com>
+Date: Thu, 12 Sep 2013 00:53:36 +0300
+Subject: [PATCH 26/27] man: fix description of sysctl.d order
+
+systemd-sysctl gives priority to the latest occurence as of commit
+04bf3c1a60d82791e0320381e9268f727708f776, but the manpage hasn't been
+updated for that.
+---
+ man/sysctl.d.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
+index 759b874..a5868e6 100644
+--- a/man/sysctl.d.xml
++++ b/man/sysctl.d.xml
+@@ -92,7 +92,7 @@
+                 alphabetical order, regardless in which of the
+                 directories they reside, to guarantee that a specific
+                 configuration file takes precedence over another file
+-                with an alphabetically later name, if both files
++                with an alphabetically earlier name, if both files
+                 contain the same variable setting.</para>
+ 
+                 <para>If the administrator wants to disable a
+-- 
+1.8.3.1
+
diff --git a/0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch b/0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
new file mode 100644
index 0000000..93e8bee
--- /dev/null
+++ b/0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
@@ -0,0 +1,58 @@
+From 71a73884d42ffb3a2b4d64f099a145b9abc2eee0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Sun, 15 Sep 2013 12:15:38 -0400
+Subject: [PATCH 27/27] transaction.c: do not point users to logs when unit not
+ found
+
+The logs are unlikely to contain any useful information in this case.
+
+Also, change "walked on cycle path" to "found dependency on", which
+is less technical and indicates the direction. With the old message,
+I was never sure if prior units depended on later ones, or vice versa.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=996133
+https://bugzilla.redhat.com/show_bug.cgi?id=997082
+---
+ src/core/transaction.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/transaction.c b/src/core/transaction.c
+index fa97b69..eef1269 100644
+--- a/src/core/transaction.c
++++ b/src/core/transaction.c
+@@ -344,7 +344,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
+         assert(!j->transaction_prev);
+ 
+         /* Does a recursive sweep through the ordering graph, looking
+-         * for a cycle. If we find cycle we try to break it. */
++         * for a cycle. If we find a cycle we try to break it. */
+ 
+         /* Have we seen this before? */
+         if (j->generation == generation) {
+@@ -371,7 +371,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
+ 
+                         /* logging for j not k here here to provide consistent narrative */
+                         log_info_unit(j->unit->id,
+-                                      "Walked on cycle path to %s/%s",
++                                      "Found dependency on %s/%s",
+                                       k->unit->id, job_type_to_string(k->type));
+ 
+                         if (!delete &&
+@@ -866,6 +866,14 @@ int transaction_add_job_and_dependencies(
+                 return -EINVAL;
+         }
+ 
++        if (type != JOB_STOP && unit->load_state == UNIT_NOT_FOUND) {
++                dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
++                               "Unit %s failed to load: %s.",
++                               unit->id,
++                               strerror(-unit->load_error));
++                return -EINVAL;
++        }
++
+         if (type != JOB_STOP && unit->load_state == UNIT_MASKED) {
+                 dbus_set_error(e, BUS_ERROR_MASKED, "Unit %s is masked.", unit->id);
+                 return -EADDRNOTAVAIL;
+-- 
+1.8.3.1
+
diff --git a/systemd.spec b/systemd.spec
index 88cc2e9..b4785e9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        204
-Release:        13%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        14%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -70,6 +70,8 @@ Patch22:        0022-Allow-tabs-in-environment-files.patch
 Patch23:        0023-Actually-allow-tabs-in-environment-files.patch
 Patch24:        0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
 Patch25:        0025-cgtop-fixup-the-online-help.patch
+Patch26:        0026-man-fix-description-of-sysctl.d-order.patch
+Patch27:        0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
 
 # git diff --src-prefix=a/ --dst-prefix=b/ v204 -- hwdb/ > systemd-hwdb.patch
 Patch99:        systemd-hwdb.patch
@@ -838,6 +840,7 @@ fi
 %changelog
 * Tue Sep 17 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> 204-14
 - Backport the hardware database (#989103).
+- Backport two small patches.
 
 * Fri Sep 06 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> 204-13
 - Backport a bunch of fixes (#995575 and others).