[systemd/f22] Bugfixes
Zbigniew Jędrzejewski-Szmek
zbyszek at fedoraproject.org
Wed Mar 4 01:13:14 UTC 2015
commit d243c149f6aa2c0ed35be0d60874a3125a4d1146
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Tue Mar 3 13:52:08 2015 -0500
Bugfixes
...-mount-add-dependencies-to-dynamically-mo.patch | 27 -
...remote-fix-certificate-status-memory-leak.patch | 28 +
...ournal-remote-fix-client_cert-memory-leak.patch | 32 +
0003-tmpfiles-Fix-parse_acl-error-message.patch | 25 +
...-test-utf8-fix-utf16-tests-on-BE-machines.patch | 23 +
...iles-avoid-creating-duplicate-acl-entries.patch | 128 +++
0006-shared-time-util-fix-gcc5-warning.patch | 29 +
...time-test-infinity-parsing-in-nanoseconds.patch | 33 +
0008-bootchart-fix-default-init-path.patch | 41 +
...emctl-bump-NOFILE-only-for-systemctl_main.patch | 41 +
...-util-avoid-freeing-uninitialized-pointer.patch | 34 +
0011-bootchart-svg-fix-checking-of-list-end.patch | 25 +
...md-add-getrandom-syscall-numbers-for-MIPS.patch | 35 +
...aker-dependencies-between-mount-and-devic.patch | 30 +
...topping-due-to-BindsTo-log-which-unit-cau.patch | 26 +-
...grade-message-about-sysctl-overrides-to-d.patch | 26 +
...l-add-some-hints-how-to-override-settings.patch | 36 +
0017-core-rework-device-state-logic.patch | 909 +++++++++++++++++++++
0018-core-fix-return-value-on-OOM.patch | 23 +
...e-x-machine-unix-prefix-for-the-container.patch | 30 +
0020-shared-AFS-is-also-a-network-filesystem.patch | 22 +
...downgrade-unit-type-not-supported-message.patch | 28 +
...ournal-remote-fix-saving-of-binary-fields.patch | 94 +++
...ix-Inappropriate-ioctl-for-device-on-ext4.patch | 34 +
...eplace-VLA-with-alloca-to-make-llvm-happy.patch | 49 ++
...ietly-ignore-ACLs-on-unsupported-filesyst.patch | 80 ++
...-assume-ac-when-sys-class-power_supply-is.patch | 27 +
systemd.spec | 37 +-
28 files changed, 1903 insertions(+), 49 deletions(-)
---
diff --git a/0001-journal-remote-fix-certificate-status-memory-leak.patch b/0001-journal-remote-fix-certificate-status-memory-leak.patch
new file mode 100644
index 0000000..bd56a5d
--- /dev/null
+++ b/0001-journal-remote-fix-certificate-status-memory-leak.patch
@@ -0,0 +1,28 @@
+From 7057db8b36594bb03c611cab711cd992ad4de31e Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Tue, 17 Feb 2015 10:33:01 +0100
+Subject: [PATCH] journal-remote: fix certificate status memory leak
+
+The output of gnutls_certificate_verification_status_print() needs to be
+freed.
+
+Noticed this while staring at verify_cert_authorized() to see what could
+possibly confuse gcc5 on armv7hl to segfault during compilation.
+
+(cherry picked from commit 9c3cf9693ac5c0a332ba376f99e6adea28b1bb0d)
+---
+ src/journal-remote/microhttpd-util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
+index 34d93379da..de9c6ab32d 100644
+--- a/src/journal-remote/microhttpd-util.c
++++ b/src/journal-remote/microhttpd-util.c
+@@ -179,6 +179,7 @@ static int verify_cert_authorized(gnutls_session_t session) {
+ return log_error_errno(r, "gnutls_certificate_verification_status_print failed: %m");
+
+ log_info("Certificate status: %s", out.data);
++ gnutls_free(out.data);
+
+ return status == 0 ? 0 : -EPERM;
+ }
diff --git a/0002-journal-remote-fix-client_cert-memory-leak.patch b/0002-journal-remote-fix-client_cert-memory-leak.patch
new file mode 100644
index 0000000..1e9f617
--- /dev/null
+++ b/0002-journal-remote-fix-client_cert-memory-leak.patch
@@ -0,0 +1,32 @@
+From 5852d2efbfb888dfb0adddb25afac0814d3ebcbb Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Tue, 17 Feb 2015 10:36:57 +0100
+Subject: [PATCH] journal-remote: fix client_cert memory leak
+
+Found by Valgrind while testing the previous memory leak fix.
+
+(cherry picked from commit 32c3d7144cf9a5c8c03761d7f198142ca0f5f7b8)
+---
+ src/journal-remote/microhttpd-util.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
+index de9c6ab32d..a95fff18f3 100644
+--- a/src/journal-remote/microhttpd-util.c
++++ b/src/journal-remote/microhttpd-util.c
+@@ -239,10 +239,14 @@ static int get_auth_dn(gnutls_x509_crt_t client_cert, char **buf) {
+ return 0;
+ }
+
++static inline void gnutls_x509_crt_deinitp(gnutls_x509_crt_t *p) {
++ gnutls_x509_crt_deinit(*p);
++}
++
+ int check_permissions(struct MHD_Connection *connection, int *code, char **hostname) {
+ const union MHD_ConnectionInfo *ci;
+ gnutls_session_t session;
+- gnutls_x509_crt_t client_cert;
++ _cleanup_(gnutls_x509_crt_deinitp) gnutls_x509_crt_t client_cert = NULL;
+ _cleanup_free_ char *buf = NULL;
+ int r;
+
diff --git a/0003-tmpfiles-Fix-parse_acl-error-message.patch b/0003-tmpfiles-Fix-parse_acl-error-message.patch
new file mode 100644
index 0000000..4fc5f89
--- /dev/null
+++ b/0003-tmpfiles-Fix-parse_acl-error-message.patch
@@ -0,0 +1,25 @@
+From ea960d3fc09c1e3745791d3433094678fd7ccd50 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Tue, 17 Feb 2015 12:47:51 +0100
+Subject: [PATCH] tmpfiles: Fix parse_acl error message
+
+parse_acl() returns the error instead of setting errno.
+
+(cherry picked from commit 484adfd914504cd7e95867cea20ca7af71b888f2)
+---
+ src/tmpfiles/tmpfiles.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index c948d4d218..88ba7e46a2 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -689,7 +689,7 @@ static int get_acls_from_arg(Item *item) {
+ * afterwards, so the mask can be added now if necessary. */
+ r = parse_acl(item->argument, &item->acl_access, &item->acl_default, !item->force);
+ if (r < 0)
+- log_warning_errno(errno, "Failed to parse ACL \"%s\": %m. Ignoring",
++ log_warning_errno(r, "Failed to parse ACL \"%s\": %m. Ignoring",
+ item->argument);
+ #else
+ log_warning_errno(ENOSYS, "ACLs are not supported. Ignoring");
diff --git a/0004-test-utf8-fix-utf16-tests-on-BE-machines.patch b/0004-test-utf8-fix-utf16-tests-on-BE-machines.patch
new file mode 100644
index 0000000..1a405cf
--- /dev/null
+++ b/0004-test-utf8-fix-utf16-tests-on-BE-machines.patch
@@ -0,0 +1,23 @@
+From 8df2bb91718bf2ccc89c41f0dd19cd0bc8da1357 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg at jklm.no>
+Date: Wed, 18 Feb 2015 14:33:50 +0100
+Subject: [PATCH] test: utf8 - fix utf16 tests on BE machines
+
+(cherry picked from commit 502184de0f95d3a124d4d4c77ae7a88747a0fac2)
+---
+ src/test/test-utf8.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
+index befa385754..346f8524c6 100644
+--- a/src/test/test-utf8.c
++++ b/src/test/test-utf8.c
+@@ -95,7 +95,7 @@ static void test_utf8_escaping_printable(void) {
+
+ static void test_utf16_to_utf8(void) {
+ char *a = NULL;
+- const uint16_t utf16[] = { 'a', 0xd800, 'b', 0xdc00, 'c', 0xd801, 0xdc37 };
++ const uint16_t utf16[] = { htole16('a'), htole16(0xd800), htole16('b'), htole16(0xdc00), htole16('c'), htole16(0xd801), htole16(0xdc37) };
+ const char utf8[] = { 'a', 'b', 'c', 0xf0, 0x90, 0x90, 0xb7, 0 };
+
+ a = utf16_to_utf8(utf16, 14);
diff --git a/0005-tmpfiles-avoid-creating-duplicate-acl-entries.patch b/0005-tmpfiles-avoid-creating-duplicate-acl-entries.patch
new file mode 100644
index 0000000..273c67b
--- /dev/null
+++ b/0005-tmpfiles-avoid-creating-duplicate-acl-entries.patch
@@ -0,0 +1,128 @@
+From c429758054ee77383ca6d7323ecdd4163d3a3718 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Mon, 23 Feb 2015 23:19:54 -0500
+Subject: [PATCH] tmpfiles: avoid creating duplicate acl entries
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89202
+https://bugs.debian.org/778656
+
+Status quo ante can be restored with:
+ getfacl -p /var/log/journal/`cat /etc/machine-id`|grep -v '^#'|sort -u|sudo setfacl --set-file=- /var/log/journal/`cat /etc/machine-id`
+
+(cherry picked from commit 1c73f3bc29111a00738569c9d40a989b161a0624)
+---
+ src/shared/acl-util.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ src/shared/acl-util.h | 4 +++
+ 2 files changed, 81 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
+index a4ff1ab878..cbe09d7aba 100644
+--- a/src/shared/acl-util.c
++++ b/src/shared/acl-util.c
+@@ -282,6 +282,77 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
+ return 0;
+ }
+
++static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
++ acl_tag_t tag_a, tag_b;
++
++ if (acl_get_tag_type(a, &tag_a) < 0)
++ return -errno;
++
++ if (acl_get_tag_type(b, &tag_b) < 0)
++ return -errno;
++
++ if (tag_a != tag_b)
++ return false;
++
++ switch (tag_a) {
++ case ACL_USER_OBJ:
++ case ACL_GROUP_OBJ:
++ case ACL_MASK:
++ case ACL_OTHER:
++ /* can have only one of those */
++ return true;
++ case ACL_USER: {
++ _cleanup_(acl_free_uid_tpp) uid_t *uid_a, *uid_b;
++
++ uid_a = acl_get_qualifier(a);
++ if (!uid_a)
++ return -errno;
++
++ uid_b = acl_get_qualifier(b);
++ if (!uid_b)
++ return -errno;
++
++ return *uid_a == *uid_b;
++ }
++ case ACL_GROUP: {
++ _cleanup_(acl_free_gid_tpp) gid_t *gid_a, *gid_b;
++
++ gid_a = acl_get_qualifier(a);
++ if (!gid_a)
++ return -errno;
++
++ gid_b = acl_get_qualifier(b);
++ if (!gid_b)
++ return -errno;
++
++ return *gid_a == *gid_b;
++ }
++ default:
++ assert_not_reached("Unknown acl tag type");
++ }
++}
++
++static int find_acl_entry(acl_t acl, acl_entry_t entry, acl_entry_t *out) {
++ acl_entry_t i;
++ int r;
++
++ for (r = acl_get_entry(acl, ACL_FIRST_ENTRY, &i);
++ r > 0;
++ r = acl_get_entry(acl, ACL_NEXT_ENTRY, &i)) {
++
++ r = acl_entry_equal(i, entry);
++ if (r < 0)
++ return r;
++ if (r > 0) {
++ *out = i;
++ return 1;
++ }
++ }
++ if (r < 0)
++ return -errno;
++ return 0;
++}
++
+ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) {
+ _cleanup_(acl_freep) acl_t old;
+ acl_entry_t i;
+@@ -297,8 +368,12 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) {
+
+ acl_entry_t j;
+
+- if (acl_create_entry(&old, &j) < 0)
+- return -errno;
++ r = find_acl_entry(old, i, &j);
++ if (r < 0)
++ return r;
++ if (r == 0)
++ if (acl_create_entry(&old, &j) < 0)
++ return -errno;
+
+ if (acl_copy_entry(j, i) < 0)
+ return -errno;
+diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
+index 90e88ffa26..fdb90063fa 100644
+--- a/src/shared/acl-util.h
++++ b/src/shared/acl-util.h
+@@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
+ DEFINE_TRIVIAL_CLEANUP_FUNC(acl_t, acl_free);
+ #define acl_free_charp acl_free
+ DEFINE_TRIVIAL_CLEANUP_FUNC(char*, acl_free_charp);
++#define acl_free_uid_tp acl_free
++DEFINE_TRIVIAL_CLEANUP_FUNC(uid_t*, acl_free_uid_tp);
++#define acl_free_gid_tp acl_free
++DEFINE_TRIVIAL_CLEANUP_FUNC(gid_t*, acl_free_gid_tp);
+
+ #endif
diff --git a/0006-shared-time-util-fix-gcc5-warning.patch b/0006-shared-time-util-fix-gcc5-warning.patch
new file mode 100644
index 0000000..73aa29c
--- /dev/null
+++ b/0006-shared-time-util-fix-gcc5-warning.patch
@@ -0,0 +1,29 @@
+From 57da343cebcd77d168d5648825698e4edbb56d2c Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel at zonque.org>
+Date: Tue, 24 Feb 2015 13:26:09 +0100
+Subject: [PATCH] shared/time-util: fix gcc5 warning
+
+ CC src/shared/libsystemd_shared_la-time-util.lo
+src/shared/time-util.c: In function 'parse_nsec':
+src/shared/time-util.c:789:25: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
+ if (!*s != 0)
+ ^
+
+(cherry picked from commit 8e8933ca0f06bae19cb6db601e83b33f8ac80f2a)
+---
+ src/shared/time-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/time-util.c b/src/shared/time-util.c
+index 947ac1fcfb..1c36c577c4 100644
+--- a/src/shared/time-util.c
++++ b/src/shared/time-util.c
+@@ -786,7 +786,7 @@ int parse_nsec(const char *t, nsec_t *nsec) {
+ s = startswith(p, "infinity");
+ if (s) {
+ s += strspn(s, WHITESPACE);
+- if (!*s != 0)
++ if (*s != 0)
+ return -EINVAL;
+
+ *nsec = NSEC_INFINITY;
diff --git a/0007-test-time-test-infinity-parsing-in-nanoseconds.patch b/0007-test-time-test-infinity-parsing-in-nanoseconds.patch
new file mode 100644
index 0000000..e10bf9c
--- /dev/null
+++ b/0007-test-time-test-infinity-parsing-in-nanoseconds.patch
@@ -0,0 +1,33 @@
+From 5248b6bbaf09c74cd152257132cba9358549446a Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel at zonque.org>
+Date: Tue, 24 Feb 2015 13:27:10 +0100
+Subject: [PATCH] test-time: test "infinity" parsing in nanoseconds
+
+(cherry picked from commit fdd30a1530810b659345c565e97beef06b7af2fd)
+---
+ src/test/test-time.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/test/test-time.c b/src/test/test-time.c
+index 8cfc4cc4fe..3840fff061 100644
+--- a/src/test/test-time.c
++++ b/src/test/test-time.c
+@@ -78,12 +78,18 @@ static void test_parse_nsec(void) {
+ assert_se(u == 2);
+ assert_se(parse_nsec(".7", &u) >= 0);
+ assert_se(u == 0);
++ assert_se(parse_nsec("infinity", &u) >= 0);
++ assert_se(u == NSEC_INFINITY);
++ assert_se(parse_nsec(" infinity ", &u) >= 0);
++ assert_se(u == NSEC_INFINITY);
+
+ assert_se(parse_nsec(" xyz ", &u) < 0);
+ assert_se(parse_nsec("", &u) < 0);
+ assert_se(parse_nsec(" . ", &u) < 0);
+ assert_se(parse_nsec(" 5. ", &u) < 0);
+ assert_se(parse_nsec(".s ", &u) < 0);
++ assert_se(parse_nsec(" infinity .7", &u) < 0);
++ assert_se(parse_nsec(".3 infinity", &u) < 0);
+ }
+
+ static void test_format_timespan_one(usec_t x, usec_t accuracy) {
diff --git a/0008-bootchart-fix-default-init-path.patch b/0008-bootchart-fix-default-init-path.patch
new file mode 100644
index 0000000..a53129a
--- /dev/null
+++ b/0008-bootchart-fix-default-init-path.patch
@@ -0,0 +1,41 @@
+From 588e3fe64330854d44f09b376a132c6384ac2499 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Tue, 24 Feb 2015 14:30:10 +0100
+Subject: [PATCH] bootchart: fix default init path
+
+Commit 6e1bf7ab99 used the wrong directory; we need rootlibexecdir, not
+rootlibdir, as the latter is something like /lib/x86_64-linux-gnu/ on
+multi-arch systems.
+
+https://launchpad.net/bugs/1423867
+(cherry picked from commit a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2)
+---
+ Makefile.am | 1 +
+ src/bootchart/bootchart.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bf04d31840..cc577ced48 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -198,6 +198,7 @@ AM_CPPFLAGS = \
+ -DKEXEC=\"$(KEXEC)\" \
+ -DLIBDIR=\"$(libdir)\" \
+ -DROOTLIBDIR=\"$(rootlibdir)\" \
++ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
+ -I $(top_srcdir)/src \
+ -I $(top_builddir)/src/shared \
+diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
+index 64a384bacf..175be68688 100644
+--- a/src/bootchart/bootchart.c
++++ b/src/bootchart/bootchart.c
+@@ -76,7 +76,7 @@ int sysfd=-1;
+ #define DEFAULT_HZ 25.0
+ #define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */
+ #define DEFAULT_SCALE_Y 20.0 /* 16px = 1 process bar */
+-#define DEFAULT_INIT ROOTLIBDIR "/systemd/systemd"
++#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd"
+ #define DEFAULT_OUTPUT "/run/log"
+
+ /* graph defaults */
diff --git a/0009-systemctl-bump-NOFILE-only-for-systemctl_main.patch b/0009-systemctl-bump-NOFILE-only-for-systemctl_main.patch
new file mode 100644
index 0000000..68b255c
--- /dev/null
+++ b/0009-systemctl-bump-NOFILE-only-for-systemctl_main.patch
@@ -0,0 +1,41 @@
+From 1df0ddca3ae405537ceb87eccdb76324f276706f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Tue, 24 Feb 2015 10:10:04 -0500
+Subject: [PATCH] systemctl: bump NOFILE only for systemctl_main
+
+It is not necessary when running as telinit, etc.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1184712
+(cherry picked from commit 95d383ee47db488f182048cfd6846f2e6b859f2b)
+---
+ src/systemctl/systemctl.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index 21cb898b9a..6b93ec8446 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -7204,6 +7204,11 @@ found:
+ }
+ }
+
++ /* Increase max number of open files to 16K if we can, we
++ * might needs this when browsing journal files, which might
++ * be split up into many files. */
++ setrlimit_closest(RLIMIT_NOFILE, &RLIMIT_MAKE_CONST(16384));
++
+ return verb->dispatch(bus, argv + optind);
+ }
+
+@@ -7453,11 +7458,6 @@ int main(int argc, char*argv[]) {
+ goto finish;
+ }
+
+- /* Increase max number of open files to 16K if we can, we
+- * might needs this when browsing journal files, which might
+- * be split up into many files. */
+- setrlimit_closest(RLIMIT_NOFILE, &RLIMIT_MAKE_CONST(16384));
+-
+ if (!avoid_bus())
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_scope != UNIT_FILE_SYSTEM, &bus);
+
diff --git a/0010-acl-util-avoid-freeing-uninitialized-pointer.patch b/0010-acl-util-avoid-freeing-uninitialized-pointer.patch
new file mode 100644
index 0000000..6ea776e
--- /dev/null
+++ b/0010-acl-util-avoid-freeing-uninitialized-pointer.patch
@@ -0,0 +1,34 @@
+From f17b6474aaca077482a68aedc1de9d654ab21bad Mon Sep 17 00:00:00 2001
+From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
+Date: Tue, 24 Feb 2015 20:40:07 +0100
+Subject: [PATCH] acl-util: avoid freeing uninitialized pointer
+
+CID#1271344/1271345
+
+(cherry picked from commit 76dcbc4992e895a377aad26f8c4a0dcd71002396)
+---
+ src/shared/acl-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
+index cbe09d7aba..e67e9acb6a 100644
+--- a/src/shared/acl-util.c
++++ b/src/shared/acl-util.c
+@@ -302,7 +302,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
+ /* can have only one of those */
+ return true;
+ case ACL_USER: {
+- _cleanup_(acl_free_uid_tpp) uid_t *uid_a, *uid_b;
++ _cleanup_(acl_free_uid_tpp) uid_t *uid_a = NULL, *uid_b = NULL;
+
+ uid_a = acl_get_qualifier(a);
+ if (!uid_a)
+@@ -315,7 +315,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
+ return *uid_a == *uid_b;
+ }
+ case ACL_GROUP: {
+- _cleanup_(acl_free_gid_tpp) gid_t *gid_a, *gid_b;
++ _cleanup_(acl_free_gid_tpp) gid_t *gid_a = NULL, *gid_b = NULL;
+
+ gid_a = acl_get_qualifier(a);
+ if (!gid_a)
diff --git a/0011-bootchart-svg-fix-checking-of-list-end.patch b/0011-bootchart-svg-fix-checking-of-list-end.patch
new file mode 100644
index 0000000..15145d1
--- /dev/null
+++ b/0011-bootchart-svg-fix-checking-of-list-end.patch
@@ -0,0 +1,25 @@
+From 668529dde3ecf35e24f39eaf3a3044099e4d5273 Mon Sep 17 00:00:00 2001
+From: Aaro Koskinen <aaro.koskinen at nokia.com>
+Date: Tue, 24 Feb 2015 18:32:31 +0200
+Subject: [PATCH] bootchart: svg: fix checking of list end
+
+If we have less samples than expected, systemd-bootchart will crash.
+
+(cherry picked from commit c1682f17a0c966988e865c649e565dae41abf32d)
+---
+ src/bootchart/svg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
+index e111fa9cce..144177cd47 100644
+--- a/src/bootchart/svg.c
++++ b/src/bootchart/svg.c
+@@ -1170,7 +1170,7 @@ static void svg_ps_bars(void) {
+
+ ps->sample = ps->sample->next;
+ sample_hz = ps->sample;
+- for (ii=0;((ii<(int)arg_hz/2)&&(ps->sample->next));ii++)
++ for (ii=0;((ii<(int)arg_hz/2)&&(sample_hz->next));ii++)
+ sample_hz = sample_hz->next;
+
+ /* subtract bootchart cpu utilization from total */
diff --git a/0012-systemd-add-getrandom-syscall-numbers-for-MIPS.patch b/0012-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
new file mode 100644
index 0000000..22c63eb
--- /dev/null
+++ b/0012-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
@@ -0,0 +1,35 @@
+From 5b49f6072e901336680708267c3d48a54c5410ae Mon Sep 17 00:00:00 2001
+From: Aaro Koskinen <aaro.koskinen at nokia.com>
+Date: Mon, 23 Feb 2015 16:01:31 +0200
+Subject: [PATCH] systemd: add getrandom syscall numbers for MIPS
+
+Add getrandom syscall numbers for MIPS. Based on Linux 3.17 kernel
+(commit 42944521af97a3b25516f15f3149aec3779656dc, "MIPS: Wire up new
+syscalls getrandom and memfd_create").
+
+(cherry picked from commit 3bec6d4690d2a7f08dc27b8221299c1db94978c4)
+---
+ src/shared/missing.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index b33a70cb2c..e72631e130 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -179,6 +179,16 @@ static inline int memfd_create(const char *name, unsigned int flags) {
+ # define __NR_getrandom 349
+ # elif defined(__powerpc__)
+ # define __NR_getrandom 359
++# elif defined _MIPS_SIM
++# if _MIPS_SIM == _MIPS_SIM_ABI32
++# define __NR_getrandom 4353
++# endif
++# if _MIPS_SIM == _MIPS_SIM_NABI32
++# define __NR_getrandom 6317
++# endif
++# if _MIPS_SIM == _MIPS_SIM_ABI64
++# define __NR_getrandom 5313
++# endif
+ # else
+ # warning "__NR_getrandom unknown for your architecture"
+ # define __NR_getrandom 0xffffffff
diff --git a/0013-unit-use-weaker-dependencies-between-mount-and-devic.patch b/0013-unit-use-weaker-dependencies-between-mount-and-devic.patch
new file mode 100644
index 0000000..9b00c5b
--- /dev/null
+++ b/0013-unit-use-weaker-dependencies-between-mount-and-devic.patch
@@ -0,0 +1,30 @@
+From fc9805756d5c0088a3a67705bbf6bea30d0d35e5 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Wed, 25 Feb 2015 22:05:14 +0100
+Subject: [PATCH] unit: use weaker dependencies between mount and device units
+ in --user mode
+
+When running in user mode unmounting of mount units when a device
+vanishes is unlikely to work, and even if it would work is already done
+by PID 1 anyway. HEnce, when creating implicit dependencies between
+mount units and their backing devices, created a Wants= type dependency
+in --user mode, but leave a BindsTo= dependency in --system mode.
+
+(cherry picked from commit 5bd4b173605142c7be493aa4d958ebaef21f421d)
+---
+ src/core/unit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index ee8e607c27..9f1e55e2f1 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -2845,7 +2845,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
+ if (r < 0)
+ return r;
+
+- r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_BINDS_TO, device, true);
++ r = unit_add_two_dependencies(u, UNIT_AFTER, u->manager->running_as == SYSTEMD_SYSTEM ? UNIT_BINDS_TO : UNIT_WANTS, device, true);
+ if (r < 0)
+ return r;
+
diff --git a/0001-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch b/0014-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
similarity index 67%
rename from 0001-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
rename to 0014-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
index 06be0cb..c4cc373 100644
--- a/0001-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
+++ b/0014-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
@@ -1,6 +1,6 @@
-From f94b2f6c88693a9dbd9230723d097d35c0e94b75 Mon Sep 17 00:00:00 2001
+From ca0cf2741ef9db81141f4444ab58dd3552c8fb1f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
-Date: Mon, 16 Feb 2015 11:43:46 -0500
+Date: Tue, 17 Feb 2015 13:47:34 -0500
Subject: [PATCH] unit: When stopping due to BindsTo=, log which unit caused it
I'm trying to track down a relatively recent change in systemd
@@ -11,24 +11,17 @@ me debug why at least.
While we're here, "break" on the first unit we find that will
deactivate, as there's no point in further iteration.
+
+(cherry picked from commit 98f738b62047229af4a929d7996e2ab04253b02c)
---
- src/core/unit.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ src/core/unit.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index ad5348b..f898bb7 100644
+index 9f1e55e2f1..563f6fe850 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
-@@ -1623,7 +1623,7 @@ static void unit_check_unneeded(Unit *u) {
-
- static void unit_check_binds_to(Unit *u) {
- bool stop = false;
-- Unit *other;
-+ Unit *other = NULL;
- Iterator i;
-
- assert(u);
-@@ -1642,12 +1642,14 @@ static void unit_check_binds_to(Unit *u) {
+@@ -1648,12 +1648,14 @@ static void unit_check_binds_to(Unit *u) {
continue;
stop = true;
@@ -44,6 +37,3 @@ index ad5348b..f898bb7 100644
/* A unit we need to run is gone. Sniff. Let's stop this. */
manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
---
-1.8.3.1
-
diff --git a/0015-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch b/0015-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
new file mode 100644
index 0000000..1a1988f
--- /dev/null
+++ b/0015-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
@@ -0,0 +1,26 @@
+From 2439dc6083d27271ee942559f0f73c99fa9e2b4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Thu, 26 Feb 2015 19:00:11 -0500
+Subject: [PATCH] sysctl: downgrade message about sysctl overrides to debug
+
+Printing it at info level was tedious. We don't do that for any other
+overrides.
+
+(cherry picked from commit 7933e4266f8124e3fca71f67757abd44155fa1cb)
+---
+ src/sysctl/sysctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index 275a5b74ae..2415d84526 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -176,7 +176,7 @@ found:
+ if (streq(value, existing))
+ continue;
+
+- log_info("Overwriting earlier assignment of %s in file '%s'.", p, path);
++ log_debug("Overwriting earlier assignment of %s in file '%s'.", p, path);
+ free(hashmap_remove(sysctl_options, p));
+ free(v);
+ }
diff --git a/0016-sysctl-add-some-hints-how-to-override-settings.patch b/0016-sysctl-add-some-hints-how-to-override-settings.patch
new file mode 100644
index 0000000..104b0bf
--- /dev/null
+++ b/0016-sysctl-add-some-hints-how-to-override-settings.patch
@@ -0,0 +1,36 @@
+From af6a96a36415400482ad504392ea93c6a0e2ed43 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Thu, 26 Feb 2015 19:05:51 -0500
+Subject: [PATCH] sysctl: add some hints how to override settings
+
+Also a link to decent documentation for sysrq keys. It is surprising
+hard to find.
+
+https://lists.fedoraproject.org/pipermail/devel/2015-February/208412.html
+(cherry picked from commit 16b65d7f463e91f6299dfa7b83d4b5fbeb109d1c)
+---
+ sysctl.d/50-default.conf | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
+index f18923399b..def151bb84 100644
+--- a/sysctl.d/50-default.conf
++++ b/sysctl.d/50-default.conf
+@@ -5,9 +5,16 @@
+ # the Free Software Foundation; either version 2.1 of the License, or
+ # (at your option) any later version.
+
+-# See sysctl.d(5) and core(5) for for details.
++# See sysctl.d(5) and core(5) for for documentation.
++
++# To override settings in this file, create a local file in /etc
++# (e.g. /etc/sysctl.d/90-override.conf), and put any assignments
++# there.
+
+ # System Request functionality of the kernel (SYNC)
++#
++# Use kernel.sysrq = 1 to allow all keys.
++# See http://fedoraproject.org/wiki/QA/Sysrq for a list of values and keys.
+ kernel.sysrq = 16
+
+ # Append the PID to the core filename
diff --git a/0017-core-rework-device-state-logic.patch b/0017-core-rework-device-state-logic.patch
new file mode 100644
index 0000000..9847676
--- /dev/null
+++ b/0017-core-rework-device-state-logic.patch
@@ -0,0 +1,909 @@
+From 5b788e932fe918fb022bc20c3a15eb59e0fad53a Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Fri, 27 Feb 2015 21:55:08 +0100
+Subject: [PATCH] core: rework device state logic
+
+This change introduces a new state "tentative" for device units. Device
+units are considered "plugged" when udev announced them, "dead" when
+they are not available in the kernel, and "tentative" when they are
+referenced in /proc/self/mountinfo or /proc/swaps but not (yet)
+announced via udev.
+
+This should fix a race when device nodes (like loop devices) are created
+and immediately mounted. Previously, systemd might end up seeing the
+mount unit before the device, and would thus pull down the mount because
+its BindTo dependency on the device would not be fulfilled.
+
+(cherry picked from commit 628c89cc68ab96fce2de7ebba5933725d147aecc)
+---
+ src/core/device.c | 368 +++++++++++++++++++++++++++++++++---------------------
+ src/core/device.h | 14 ++-
+ src/core/mount.c | 46 ++++---
+ src/core/swap.c | 32 +++--
+ src/core/swap.h | 4 +-
+ src/core/unit.c | 1 -
+ 6 files changed, 285 insertions(+), 180 deletions(-)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index d3deac3936..75b9a46287 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -36,7 +36,8 @@
+
+ static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
+ [DEVICE_DEAD] = UNIT_INACTIVE,
+- [DEVICE_PLUGGED] = UNIT_ACTIVE
++ [DEVICE_TENTATIVE] = UNIT_ACTIVATING,
++ [DEVICE_PLUGGED] = UNIT_ACTIVE,
+ };
+
+ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata);
+@@ -65,6 +66,41 @@ static void device_unset_sysfs(Device *d) {
+ d->sysfs = NULL;
+ }
+
++static int device_set_sysfs(Device *d, const char *sysfs) {
++ Device *first;
++ char *copy;
++ int r;
++
++ assert(d);
++
++ if (streq_ptr(d->sysfs, sysfs))
++ return 0;
++
++ r = hashmap_ensure_allocated(&UNIT(d)->manager->devices_by_sysfs, &string_hash_ops);
++ if (r < 0)
++ return r;
++
++ copy = strdup(sysfs);
++ if (!copy)
++ return -ENOMEM;
++
++ device_unset_sysfs(d);
++
++ first = hashmap_get(UNIT(d)->manager->devices_by_sysfs, sysfs);
++ LIST_PREPEND(same_sysfs, first, d);
++
++ r = hashmap_replace(UNIT(d)->manager->devices_by_sysfs, copy, first);
++ if (r < 0) {
++ LIST_REMOVE(same_sysfs, first, d);
++ free(copy);
++ return r;
++ }
++
++ d->sysfs = copy;
++
++ return 0;
++}
++
+ static void device_init(Unit *u) {
+ Device *d = DEVICE(u);
+
+@@ -112,8 +148,13 @@ static int device_coldplug(Unit *u) {
+ assert(d);
+ assert(d->state == DEVICE_DEAD);
+
+- if (d->sysfs)
++ if (d->found & DEVICE_FOUND_UDEV)
++ /* If udev says the device is around, it's around */
+ device_set_state(d, DEVICE_PLUGGED);
++ else if (d->found != DEVICE_NOT_FOUND)
++ /* If a device is found in /proc/self/mountinfo or
++ * /proc/swaps, it's "tentatively" around. */
++ device_set_state(d, DEVICE_TENTATIVE);
+
+ return 0;
+ }
+@@ -142,49 +183,9 @@ _pure_ static const char *device_sub_state_to_string(Unit *u) {
+ return device_state_to_string(DEVICE(u)->state);
+ }
+
+-static int device_add_escaped_name(Unit *u, const char *dn) {
+- _cleanup_free_ char *e = NULL;
+- int r;
+-
+- assert(u);
+- assert(dn);
+- assert(dn[0] == '/');
+-
+- e = unit_name_from_path(dn, ".device");
+- if (!e)
+- return -ENOMEM;
+-
+- r = unit_add_name(u, e);
+- if (r < 0 && r != -EEXIST)
+- return r;
+-
+- return 0;
+-}
+-
+-static int device_find_escape_name(Manager *m, const char *dn, Unit **_u) {
+- _cleanup_free_ char *e = NULL;
+- Unit *u;
+-
+- assert(m);
+- assert(dn);
+- assert(dn[0] == '/');
+- assert(_u);
+-
+- e = unit_name_from_path(dn, ".device");
+- if (!e)
+- return -ENOMEM;
+-
+- u = manager_get_unit(m, e);
+- if (u) {
+- *_u = u;
+- return 1;
+- }
+-
+- return 0;
+-}
+-
+-static int device_make_description(Unit *u, struct udev_device *dev, const char *path) {
++static int device_update_description(Unit *u, struct udev_device *dev, const char *path) {
+ const char *model;
++ int r;
+
+ assert(u);
+ assert(dev);
+@@ -209,13 +210,16 @@ static int device_make_description(Unit *u, struct udev_device *dev, const char
+
+ j = strjoin(model, " ", label, NULL);
+ if (j)
+- return unit_set_description(u, j);
+- }
++ r = unit_set_description(u, j);
++ } else
++ r = unit_set_description(u, model);
++ } else
++ r = unit_set_description(u, path);
+
+- return unit_set_description(u, model);
+- }
++ if (r < 0)
++ log_unit_error_errno(u->id, r, "Failed to set device description: %m");
+
+- return unit_set_description(u, path);
++ return r;
+ }
+
+ static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
+@@ -242,20 +246,20 @@ static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
+
+ n = unit_name_mangle(e, MANGLE_NOGLOB);
+ if (!n)
+- return -ENOMEM;
++ return log_oom();
+
+ r = unit_add_dependency_by_name(u, UNIT_WANTS, n, NULL, true);
+ if (r < 0)
+- return r;
++ return log_unit_error_errno(u->id, r, "Failed to add wants dependency: %m");
+ }
+ if (!isempty(state))
+- log_unit_warning(u->id, "Property %s on %s has trailing garbage, ignoring.",
+- property, strna(udev_device_get_syspath(dev)));
++ log_unit_warning(u->id, "Property %s on %s has trailing garbage, ignoring.", property, strna(udev_device_get_syspath(dev)));
+
+ return 0;
+ }
+
+-static int device_update_unit(Manager *m, struct udev_device *dev, const char *path, bool main) {
++static int device_setup_unit(Manager *m, struct udev_device *dev, const char *path, bool main) {
++ _cleanup_free_ char *e = NULL;
+ const char *sysfs;
+ Unit *u = NULL;
+ bool delete;
+@@ -269,12 +273,18 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
+ if (!sysfs)
+ return 0;
+
+- r = device_find_escape_name(m, path, &u);
+- if (r < 0)
+- return r;
++ e = unit_name_from_path(path, ".device");
++ if (!e)
++ return log_oom();
++
++ u = manager_get_unit(m, e);
+
+- if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs))
++ if (u &&
++ DEVICE(u)->sysfs &&
++ !path_equal(DEVICE(u)->sysfs, sysfs)) {
++ log_unit_error(u->id, "Device %s appeared twice with different sysfs paths %s and %s", e, DEVICE(u)->sysfs, sysfs);
+ return -EEXIST;
++ }
+
+ if (!u) {
+ delete = true;
+@@ -283,7 +293,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
+ if (!u)
+ return log_oom();
+
+- r = device_add_escaped_name(u, path);
++ r = unit_add_name(u, e);
+ if (r < 0)
+ goto fail;
+
+@@ -295,37 +305,16 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
+ * actually been seen yet ->sysfs will not be
+ * initialized. Hence initialize it if necessary. */
+
+- if (!DEVICE(u)->sysfs) {
+- Device *first;
+-
+- DEVICE(u)->sysfs = strdup(sysfs);
+- if (!DEVICE(u)->sysfs) {
+- r = -ENOMEM;
+- goto fail;
+- }
+-
+- r = hashmap_ensure_allocated(&m->devices_by_sysfs, &string_hash_ops);
+- if (r < 0)
+- goto fail;
+-
+- first = hashmap_get(m->devices_by_sysfs, sysfs);
+- LIST_PREPEND(same_sysfs, first, DEVICE(u));
+-
+- r = hashmap_replace(m->devices_by_sysfs, DEVICE(u)->sysfs, first);
+- if (r < 0)
+- goto fail;
+- }
+-
+- device_make_description(u, dev, path);
++ r = device_set_sysfs(DEVICE(u), sysfs);
++ if (r < 0)
++ goto fail;
+
+- if (main) {
+- /* The additional systemd udev properties we only
+- * interpret for the main object */
++ (void) device_update_description(u, dev, path);
+
+- r = device_add_udev_wants(u, dev);
+- if (r < 0)
+- goto fail;
+- }
++ /* The additional systemd udev properties we only interpret
++ * for the main object */
++ if (main)
++ (void) device_add_udev_wants(u, dev);
+
+ /* Note that this won't dispatch the load queue, the caller
+ * has to do that if needed and appropriate */
+@@ -334,7 +323,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
+ return 0;
+
+ fail:
+- log_warning_errno(r, "Failed to load device unit: %m");
++ log_unit_warning_errno(u->id, r, "Failed to set up device unit: %m");
+
+ if (delete && u)
+ unit_free(u);
+@@ -342,7 +331,7 @@ fail:
+ return r;
+ }
+
+-static int device_process_new_device(Manager *m, struct udev_device *dev) {
++static int device_process_new(Manager *m, struct udev_device *dev) {
+ const char *sysfs, *dn, *alias;
+ struct udev_list_entry *item = NULL, *first = NULL;
+ int r;
+@@ -354,14 +343,14 @@ static int device_process_new_device(Manager *m, struct udev_device *dev) {
+ return 0;
+
+ /* Add the main unit named after the sysfs path */
+- r = device_update_unit(m, dev, sysfs, true);
++ r = device_setup_unit(m, dev, sysfs, true);
+ if (r < 0)
+ return r;
+
+ /* Add an additional unit for the device node */
+ dn = udev_device_get_devnode(dev);
+ if (dn)
+- device_update_unit(m, dev, dn, false);
++ (void) device_setup_unit(m, dev, dn, false);
+
+ /* Add additional units for all symlinks */
+ first = udev_device_get_devlinks_list_entry(dev);
+@@ -388,7 +377,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev) {
+ st.st_rdev != udev_device_get_devnum(dev))
+ continue;
+
+- device_update_unit(m, dev, p, false);
++ (void) device_setup_unit(m, dev, p, false);
+ }
+
+ /* Add additional units for all explicitly configured
+@@ -405,7 +394,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev) {
+ e[l] = 0;
+
+ if (path_is_absolute(e))
+- device_update_unit(m, dev, e, false);
++ (void) device_setup_unit(m, dev, e, false);
+ else
+ log_warning("SYSTEMD_ALIAS for %s is not an absolute path, ignoring: %s", sysfs, e);
+ }
+@@ -416,39 +405,62 @@ static int device_process_new_device(Manager *m, struct udev_device *dev) {
+ return 0;
+ }
+
+-static void device_set_path_plugged(Manager *m, struct udev_device *dev) {
+- const char *sysfs;
++static void device_update_found_one(Device *d, bool add, DeviceFound found, bool now) {
++ DeviceFound n;
++
++ assert(d);
++
++ n = add ? (d->found | found) : (d->found & ~found);
++ if (n == d->found)
++ return;
++
++ d->found = n;
++
++ if (now) {
++ if (d->found & DEVICE_FOUND_UDEV)
++ device_set_state(d, DEVICE_PLUGGED);
++ else if (d->found != DEVICE_NOT_FOUND)
++ device_set_state(d, DEVICE_TENTATIVE);
++ else
++ device_set_state(d, DEVICE_DEAD);
++ }
++}
++
++static int device_update_found_by_sysfs(Manager *m, const char *sysfs, bool add, DeviceFound found, bool now) {
+ Device *d, *l;
+
+ assert(m);
+- assert(dev);
++ assert(sysfs);
+
+- sysfs = udev_device_get_syspath(dev);
+- if (!sysfs)
+- return;
++ if (found == DEVICE_NOT_FOUND)
++ return 0;
+
+ l = hashmap_get(m->devices_by_sysfs, sysfs);
+ LIST_FOREACH(same_sysfs, d, l)
+- device_set_state(d, DEVICE_PLUGGED);
++ device_update_found_one(d, add, found, now);
++
++ return 0;
+ }
+
+-static int device_process_removed_device(Manager *m, struct udev_device *dev) {
+- const char *sysfs;
+- Device *d;
++static int device_update_found_by_name(Manager *m, const char *path, bool add, DeviceFound found, bool now) {
++ _cleanup_free_ char *e = NULL;
++ Unit *u;
+
+ assert(m);
+- assert(dev);
++ assert(path);
+
+- sysfs = udev_device_get_syspath(dev);
+- if (!sysfs)
+- return -ENOMEM;
++ if (found == DEVICE_NOT_FOUND)
++ return 0;
+
+- /* Remove all units of this sysfs path */
+- while ((d = hashmap_get(m->devices_by_sysfs, sysfs))) {
+- device_unset_sysfs(d);
+- device_set_state(d, DEVICE_DEAD);
+- }
++ e = unit_name_from_path(path, ".device");
++ if (!e)
++ return log_oom();
+
++ u = manager_get_unit(m, e);
++ if (!u)
++ return 0;
++
++ device_update_found_one(DEVICE(u), add, found, now);
+ return 0;
+ }
+
+@@ -464,22 +476,6 @@ static bool device_is_ready(struct udev_device *dev) {
+ return parse_boolean(ready) != 0;
+ }
+
+-static int device_process_new_path(Manager *m, const char *path) {
+- _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
+-
+- assert(m);
+- assert(path);
+-
+- dev = udev_device_new_from_syspath(m->udev, path);
+- if (!dev)
+- return log_oom();
+-
+- if (!device_is_ready(dev))
+- return 0;
+-
+- return device_process_new_device(m, dev);
+-}
+-
+ static Unit *device_following(Unit *u) {
+ Device *d = DEVICE(u);
+ Device *other, *first = NULL;
+@@ -606,12 +602,31 @@ static int device_enumerate(Manager *m) {
+ goto fail;
+
+ first = udev_enumerate_get_list_entry(e);
+- udev_list_entry_foreach(item, first)
+- device_process_new_path(m, udev_list_entry_get_name(item));
++ udev_list_entry_foreach(item, first) {
++ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
++ const char *sysfs;
++
++ sysfs = udev_list_entry_get_name(item);
++
++ dev = udev_device_new_from_syspath(m->udev, sysfs);
++ if (!dev) {
++ log_oom();
++ continue;
++ }
++
++ if (!device_is_ready(dev))
++ continue;
++
++ (void) device_process_new(m, dev);
++
++ device_update_found_by_sysfs(m, sysfs, true, DEVICE_FOUND_UDEV, false);
++ }
+
+ return 0;
+
+ fail:
++ log_error_errno(r, "Failed to enumerate devices: %m");
++
+ device_shutdown(m);
+ return r;
+ }
+@@ -619,7 +634,7 @@ fail:
+ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
+ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
+ Manager *m = userdata;
+- const char *action;
++ const char *action, *sysfs;
+ int r;
+
+ assert(m);
+@@ -641,33 +656,47 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
+ if (!dev)
+ return 0;
+
++ sysfs = udev_device_get_syspath(dev);
++ if (!sysfs) {
++ log_error("Failed to get udev sys path.");
++ return 0;
++ }
++
+ action = udev_device_get_action(dev);
+ if (!action) {
+ log_error("Failed to get udev action string.");
+ return 0;
+ }
+
+- if (streq(action, "remove") || !device_is_ready(dev)) {
+- r = device_process_removed_device(m, dev);
+- if (r < 0)
+- log_error_errno(r, "Failed to process device remove event: %m");
+-
+- r = swap_process_removed_device(m, dev);
++ if (streq(action, "remove")) {
++ r = swap_process_device_remove(m, dev);
+ if (r < 0)
+ log_error_errno(r, "Failed to process swap device remove event: %m");
+
+- } else {
+- r = device_process_new_device(m, dev);
+- if (r < 0)
+- log_error_errno(r, "Failed to process device new event: %m");
++ /* If we get notified that a device was removed by
++ * udev, then it's completely gone, hence unset all
++ * found bits */
++ device_update_found_by_sysfs(m, sysfs, false, DEVICE_FOUND_UDEV|DEVICE_FOUND_MOUNT|DEVICE_FOUND_SWAP, true);
+
+- r = swap_process_new_device(m, dev);
++ } else if (device_is_ready(dev)) {
++
++ (void) device_process_new(m, dev);
++
++ r = swap_process_device_new(m, dev);
+ if (r < 0)
+ log_error_errno(r, "Failed to process swap device new event: %m");
+
+ manager_dispatch_load_queue(m);
+
+- device_set_path_plugged(m, dev);
++ /* The device is found now, set the udev found bit */
++ device_update_found_by_sysfs(m, sysfs, true, DEVICE_FOUND_UDEV, true);
++
++ } else {
++ /* The device is nominally around, but not ready for
++ * us. Hence unset the udev bit, but leave the rest
++ * around. */
++
++ device_update_found_by_sysfs(m, sysfs, false, DEVICE_FOUND_UDEV, true);
+ }
+
+ return 0;
+@@ -686,9 +715,58 @@ static bool device_supported(Manager *m) {
+ return read_only <= 0;
+ }
+
++int device_found_node(Manager *m, const char *node, bool add, DeviceFound found, bool now) {
++ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
++ struct stat st;
++
++ assert(m);
++ assert(node);
++
++ /* This is called whenever we find a device referenced in
++ * /proc/swaps or /proc/self/mounts. Such a device might be
++ * mounted/enabled at a time where udev has not finished
++ * probing it yet, and we thus haven't learned about it
++ * yet. In this case we will set the device unit to
++ * "tentative" state. */
++
++ if (add) {
++ if (!path_startswith(node, "/dev"))
++ return 0;
++
++ if (stat(node, &st) < 0) {
++ if (errno == ENOENT)
++ return 0;
++
++ return log_error_errno(errno, "Failed to stat device node file %s: %m", node);
++ }
++
++ if (!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode))
++ return 0;
++
++ dev = udev_device_new_from_devnum(m->udev, S_ISBLK(st.st_mode) ? 'b' : 'c', st.st_rdev);
++ if (!dev) {
++ if (errno == ENOENT)
++ return 0;
++
++ return log_oom();
++ }
++
++ /* If the device is known in the kernel and newly
++ * appeared, then we'll create a device unit for it,
++ * under the name referenced in /proc/swaps or
++ * /proc/self/mountinfo. */
++
++ (void) device_setup_unit(m, dev, node, false);
++ }
++
++ /* Update the device unit's state, should it exist */
++ return device_update_found_by_name(m, node, add, found, now);
++}
++
+ static const char* const device_state_table[_DEVICE_STATE_MAX] = {
+ [DEVICE_DEAD] = "dead",
+- [DEVICE_PLUGGED] = "plugged"
++ [DEVICE_TENTATIVE] = "tentative",
++ [DEVICE_PLUGGED] = "plugged",
+ };
+
+ DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
+diff --git a/src/core/device.h b/src/core/device.h
+index bb7ae07834..0609b20fdb 100644
+--- a/src/core/device.h
++++ b/src/core/device.h
+@@ -29,20 +29,28 @@ typedef struct Device Device;
+ * simplifies the state engine greatly */
+ typedef enum DeviceState {
+ DEVICE_DEAD,
+- DEVICE_PLUGGED,
++ DEVICE_TENTATIVE, /* mounted or swapped, but not (yet) announced by udev */
++ DEVICE_PLUGGED, /* announced by udev */
+ _DEVICE_STATE_MAX,
+ _DEVICE_STATE_INVALID = -1
+ } DeviceState;
+
++typedef enum DeviceFound {
++ DEVICE_NOT_FOUND = 0,
++ DEVICE_FOUND_UDEV = 1,
++ DEVICE_FOUND_MOUNT = 2,
++ DEVICE_FOUND_SWAP = 4,
++} DeviceFound;
++
+ struct Device {
+ Unit meta;
+
+ char *sysfs;
++ DeviceFound found;
+
+ /* In order to be able to distinguish dependencies on
+ different device nodes we might end up creating multiple
+ devices for the same sysfs path. We chain them up here. */
+-
+ LIST_FIELDS(struct Device, same_sysfs);
+
+ DeviceState state;
+@@ -52,3 +60,5 @@ extern const UnitVTable device_vtable;
+
+ const char* device_state_to_string(DeviceState i) _const_;
+ DeviceState device_state_from_string(const char *s) _pure_;
++
++int device_found_node(Manager *m, const char *node, bool add, DeviceFound found, bool now);
+diff --git a/src/core/mount.c b/src/core/mount.c
+index f3977e62de..c971330af2 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1391,7 +1391,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
+ return 0;
+ }
+
+-static int mount_add_one(
++static int mount_setup_unit(
+ Manager *m,
+ const char *what,
+ const char *where,
+@@ -1434,7 +1434,7 @@ static int mount_add_one(
+
+ u = unit_new(m, sizeof(Mount));
+ if (!u)
+- return -ENOMEM;
++ return log_oom();
+
+ r = unit_add_name(u, e);
+ if (r < 0)
+@@ -1547,6 +1547,8 @@ static int mount_add_one(
+ return 0;
+
+ fail:
++ log_warning_errno(r, "Failed to set up mount unit: %m");
++
+ if (delete && u)
+ unit_free(u);
+
+@@ -1554,33 +1556,36 @@ fail:
+ }
+
+ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+- _cleanup_(mnt_free_tablep) struct libmnt_table *tb = NULL;
+- _cleanup_(mnt_free_iterp) struct libmnt_iter *itr = NULL;
+- struct libmnt_fs *fs;
++ _cleanup_(mnt_free_tablep) struct libmnt_table *t = NULL;
++ _cleanup_(mnt_free_iterp) struct libmnt_iter *i = NULL;
+ int r = 0;
+
+ assert(m);
+
+- tb = mnt_new_table();
+- itr = mnt_new_iter(MNT_ITER_FORWARD);
+- if (!tb || !itr)
++ t = mnt_new_table();
++ if (!t)
+ return log_oom();
+
+- r = mnt_table_parse_mtab(tb, NULL);
++ i = mnt_new_iter(MNT_ITER_FORWARD);
++ if (!i)
++ return log_oom();
++
++ r = mnt_table_parse_mtab(t, NULL);
+ if (r < 0)
+- return r;
++ return log_error_errno(r, "Failed to parse /proc/self/mountinfo: %m");
+
+ r = 0;
+ for (;;) {
+ const char *device, *path, *options, *fstype;
+ _cleanup_free_ const char *d = NULL, *p = NULL;
++ struct libmnt_fs *fs;
+ int k;
+
+- k = mnt_table_next_fs(tb, itr, &fs);
++ k = mnt_table_next_fs(t, i, &fs);
+ if (k == 1)
+ break;
+- else if (k < 0)
+- return log_error_errno(k, "Failed to get next entry from /etc/fstab: %m");
++ if (k < 0)
++ return log_error_errno(k, "Failed to get next entry from /proc/self/mountinfo: %m");
+
+ device = mnt_fs_get_source(fs);
+ path = mnt_fs_get_target(fs);
+@@ -1588,11 +1593,16 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+ fstype = mnt_fs_get_fstype(fs);
+
+ d = cunescape(device);
++ if (!d)
++ return log_oom();
++
+ p = cunescape(path);
+- if (!d || !p)
++ if (!p)
+ return log_oom();
+
+- k = mount_add_one(m, d, p, options, fstype, set_flags);
++ (void) device_found_node(m, d, true, DEVICE_FOUND_MOUNT, set_flags);
++
++ k = mount_setup_unit(m, d, p, options, fstype, set_flags);
+ if (r == 0 && k < 0)
+ r = k;
+ }
+@@ -1736,8 +1746,6 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
+
+ r = mount_load_proc_self_mountinfo(m, true);
+ if (r < 0) {
+- log_error_errno(r, "Failed to reread /proc/self/mountinfo: %m");
+-
+ /* Reset flags, just in case, for later calls */
+ LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {
+ Mount *mount = MOUNT(u);
+@@ -1770,6 +1778,10 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
+ break;
+ }
+
++ if (mount->parameters_proc_self_mountinfo.what)
++ (void) device_found_node(m, mount->parameters_proc_self_mountinfo.what, false, DEVICE_FOUND_MOUNT, true);
++
++
+ } else if (mount->just_mounted || mount->just_changed) {
+
+ /* New or changed mount entry */
+diff --git a/src/core/swap.c b/src/core/swap.c
+index 6997921fde..5c19af5d91 100644
+--- a/src/core/swap.c
++++ b/src/core/swap.c
+@@ -338,7 +338,7 @@ static int swap_load(Unit *u) {
+ return swap_verify(s);
+ }
+
+-static int swap_add_one(
++static int swap_setup_unit(
+ Manager *m,
+ const char *what,
+ const char *what_proc_swaps,
+@@ -363,8 +363,10 @@ static int swap_add_one(
+
+ if (u &&
+ SWAP(u)->from_proc_swaps &&
+- !path_equal(SWAP(u)->parameters_proc_swaps.what, what_proc_swaps))
++ !path_equal(SWAP(u)->parameters_proc_swaps.what, what_proc_swaps)) {
++ log_error("Swap %s appeared twice with different device paths %s and %s", e, SWAP(u)->parameters_proc_swaps.what, what_proc_swaps);
+ return -EEXIST;
++ }
+
+ if (!u) {
+ delete = true;
+@@ -379,7 +381,7 @@ static int swap_add_one(
+
+ SWAP(u)->what = strdup(what);
+ if (!SWAP(u)->what) {
+- r = log_oom();
++ r = -ENOMEM;
+ goto fail;
+ }
+
+@@ -407,7 +409,6 @@ static int swap_add_one(
+ p->priority = priority;
+
+ unit_add_to_dbus_queue(u);
+-
+ return 0;
+
+ fail:
+@@ -419,7 +420,7 @@ fail:
+ return r;
+ }
+
+-static int swap_process_new_swap(Manager *m, const char *device, int prio, bool set_flags) {
++static int swap_process_new(Manager *m, const char *device, int prio, bool set_flags) {
+ _cleanup_udev_device_unref_ struct udev_device *d = NULL;
+ struct udev_list_entry *item = NULL, *first = NULL;
+ const char *dn;
+@@ -428,7 +429,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool
+
+ assert(m);
+
+- r = swap_add_one(m, device, device, prio, set_flags);
++ r = swap_setup_unit(m, device, device, prio, set_flags);
+ if (r < 0)
+ return r;
+
+@@ -444,7 +445,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool
+ /* Add the main device node */
+ dn = udev_device_get_devnode(d);
+ if (dn && !streq(dn, device))
+- swap_add_one(m, dn, device, prio, set_flags);
++ swap_setup_unit(m, dn, device, prio, set_flags);
+
+ /* Add additional units for all symlinks */
+ first = udev_device_get_devlinks_list_entry(d);
+@@ -465,7 +466,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool
+ st.st_rdev != udev_device_get_devnum(d))
+ continue;
+
+- swap_add_one(m, p, device, prio, set_flags);
++ swap_setup_unit(m, p, device, prio, set_flags);
+ }
+
+ return r;
+@@ -1091,15 +1092,17 @@ static int swap_load_proc_swaps(Manager *m, bool set_flags) {
+ if (k == EOF)
+ break;
+
+- log_warning("Failed to parse /proc/swaps:%u", i);
++ log_warning("Failed to parse /proc/swaps:%u.", i);
+ continue;
+ }
+
+ d = cunescape(dev);
+ if (!d)
+- return -ENOMEM;
++ return log_oom();
++
++ device_found_node(m, d, true, DEVICE_FOUND_SWAP, set_flags);
+
+- k = swap_process_new_swap(m, d, prio, set_flags);
++ k = swap_process_new(m, d, prio, set_flags);
+ if (k < 0)
+ r = k;
+ }
+@@ -1151,6 +1154,9 @@ static int swap_dispatch_io(sd_event_source *source, int fd, uint32_t revents, v
+ break;
+ }
+
++ if (swap->what)
++ device_found_node(m, swap->what, false, DEVICE_FOUND_SWAP, true);
++
+ } else if (swap->just_activated) {
+
+ /* New swap entry */
+@@ -1298,7 +1304,7 @@ fail:
+ return r;
+ }
+
+-int swap_process_new_device(Manager *m, struct udev_device *dev) {
++int swap_process_device_new(Manager *m, struct udev_device *dev) {
+ struct udev_list_entry *item = NULL, *first = NULL;
+ _cleanup_free_ char *e = NULL;
+ const char *dn;
+@@ -1341,7 +1347,7 @@ int swap_process_new_device(Manager *m, struct udev_device *dev) {
+ return r;
+ }
+
+-int swap_process_removed_device(Manager *m, struct udev_device *dev) {
++int swap_process_device_remove(Manager *m, struct udev_device *dev) {
+ const char *dn;
+ int r = 0;
+ Swap *s;
+diff --git a/src/core/swap.h b/src/core/swap.h
+index 73e64d87a4..914a2dbccd 100644
+--- a/src/core/swap.h
++++ b/src/core/swap.h
+@@ -116,8 +116,8 @@ struct Swap {
+
+ extern const UnitVTable swap_vtable;
+
+-int swap_process_new_device(Manager *m, struct udev_device *dev);
+-int swap_process_removed_device(Manager *m, struct udev_device *dev);
++int swap_process_device_new(Manager *m, struct udev_device *dev);
++int swap_process_device_remove(Manager *m, struct udev_device *dev);
+
+ const char* swap_state_to_string(SwapState i) _const_;
+ SwapState swap_state_from_string(const char *s) _pure_;
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 563f6fe850..a6558ee23b 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -2843,7 +2843,6 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
+ return -ENOMEM;
+
+ r = manager_load_unit(u->manager, e, NULL, NULL, &device);
+-
+ if (r < 0)
+ return r;
+
diff --git a/0018-core-fix-return-value-on-OOM.patch b/0018-core-fix-return-value-on-OOM.patch
new file mode 100644
index 0000000..a9d0ff6
--- /dev/null
+++ b/0018-core-fix-return-value-on-OOM.patch
@@ -0,0 +1,23 @@
+From 3d3a67138c63b47f2a5723577f886bc3c7995748 Mon Sep 17 00:00:00 2001
+From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
+Date: Sat, 28 Feb 2015 23:39:55 +0100
+Subject: [PATCH] core: fix return value on OOM
+
+(cherry picked from commit c43b2132f37264600cc26e07c8d85dfdd6c969f0)
+---
+ src/core/device.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index 75b9a46287..1cc103c290 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -211,6 +211,8 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha
+ j = strjoin(model, " ", label, NULL);
+ if (j)
+ r = unit_set_description(u, j);
++ else
++ r = -ENOMEM;
+ } else
+ r = unit_set_description(u, model);
+ } else
diff --git a/0019-machined-use-x-machine-unix-prefix-for-the-container.patch b/0019-machined-use-x-machine-unix-prefix-for-the-container.patch
new file mode 100644
index 0000000..4abde6c
--- /dev/null
+++ b/0019-machined-use-x-machine-unix-prefix-for-the-container.patch
@@ -0,0 +1,30 @@
+From 9a46fe3127eea552cd76d4b549f8d8ba70ea01b3 Mon Sep 17 00:00:00 2001
+From: Benjamin Franzke <benjaminfranzke at googlemail.com>
+Date: Thu, 19 Feb 2015 20:47:28 +0100
+Subject: [PATCH] machined: use x-machine-unix prefix for the container bus on
+ dbus1
+
+This fixes "machinectl login" on systems configured with --disable-kdbus.
+
+The error was:
+machinectl login foo
+Failed to get machine PTY: Input/output error
+
+(cherry picked from commit f2273101c21bc59a390379e182e53cd4f07a7e71)
+---
+ src/machine/machine-dbus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
+index b46f0a8dac..b0f0f66e09 100644
+--- a/src/machine/machine-dbus.c
++++ b/src/machine/machine-dbus.c
+@@ -477,7 +477,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
+ #ifdef ENABLE_KDBUS
+ asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT ";x-machine-unix:pid=" PID_FMT, m->leader, m->leader);
+ #else
+- asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT, m->leader);
++ asprintf(&container_bus->address, "x-machine-unix:pid=" PID_FMT, m->leader);
+ #endif
+ if (!container_bus->address)
+ return -ENOMEM;
diff --git a/0020-shared-AFS-is-also-a-network-filesystem.patch b/0020-shared-AFS-is-also-a-network-filesystem.patch
new file mode 100644
index 0000000..f2f42ed
--- /dev/null
+++ b/0020-shared-AFS-is-also-a-network-filesystem.patch
@@ -0,0 +1,22 @@
+From 3c350019fe9e4be16bf110988c324cfa3a21c61b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez at opensuse.org>
+Date: Fri, 20 Feb 2015 15:35:11 -0300
+Subject: [PATCH] shared: AFS is also a network filesystem
+
+(cherry picked from commit ba89821c104d959082aad6f3f0e05a8afd575023)
+---
+ src/shared/util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index ba035caed0..f24b5b4ec5 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -1689,6 +1689,7 @@ bool chars_intersect(const char *a, const char *b) {
+
+ bool fstype_is_network(const char *fstype) {
+ static const char table[] =
++ "afs\0"
+ "cifs\0"
+ "smbfs\0"
+ "sshfs\0"
diff --git a/0021-core-downgrade-unit-type-not-supported-message.patch b/0021-core-downgrade-unit-type-not-supported-message.patch
new file mode 100644
index 0000000..2794ae1
--- /dev/null
+++ b/0021-core-downgrade-unit-type-not-supported-message.patch
@@ -0,0 +1,28 @@
+From 4e2d4dd757c6faa4d5a471c10cf6f45978524845 Mon Sep 17 00:00:00 2001
+From: Umut Tezduyar Lindskog <umut.tezduyar at axis.com>
+Date: Fri, 20 Feb 2015 10:53:28 +0100
+Subject: [PATCH] core: downgrade unit type not supported message
+
+Otherwise every daemon reload prints out warnings like:
+
+systemd[1]: Unit type .busname is not supported on this system.
+systemd[1]: Unit type .swap is not supported on this system.
+
+(cherry picked from commit 03afec3c9aa849ba13161c253b129b834298fd40)
+---
+ 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 4775219e4a..bc9b7ec620 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -961,7 +961,7 @@ int manager_enumerate(Manager *m) {
+ int q;
+
+ if (unit_vtable[c]->supported && !unit_vtable[c]->supported(m)) {
+- log_info("Unit type .%s is not supported on this system.", unit_type_to_string(c));
++ log_debug("Unit type .%s is not supported on this system.", unit_type_to_string(c));
+ continue;
+ }
+
diff --git a/0022-journal-remote-fix-saving-of-binary-fields.patch b/0022-journal-remote-fix-saving-of-binary-fields.patch
new file mode 100644
index 0000000..6fd8cf0
--- /dev/null
+++ b/0022-journal-remote-fix-saving-of-binary-fields.patch
@@ -0,0 +1,94 @@
+From 91a3ba906422127bb12095d1c7d0c7f0cb385588 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Mon, 2 Mar 2015 10:34:51 -0500
+Subject: [PATCH] journal-remote: fix saving of binary fields
+
+Binary fields were not processed properly, and resulting journal files
+were non-conforming, resulting in an error ("Invalid field.") when reading.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89391
+(cherry picked from commit 09d801a82a46df518dd752e40bf13ac404daa2ce)
+---
+ src/journal-remote/journal-remote-parse.c | 31 ++++++++++++++++++-------------
+ src/journal-remote/journal-remote-parse.h | 4 +++-
+ 2 files changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
+index d9dea8deb0..afded7e380 100644
+--- a/src/journal-remote/journal-remote-parse.c
++++ b/src/journal-remote/journal-remote-parse.c
+@@ -344,22 +344,25 @@ int process_data(RemoteSource *source) {
+ LLLLLLLL0011223344...\n
+ */
+ sep = memchr(line, '=', n);
+- if (sep)
++ if (sep) {
+ /* chomp newline */
+ n--;
+- else
++
++ r = iovw_put(&source->iovw, line, n);
++ if (r < 0)
++ return r;
++ } else {
+ /* replace \n with = */
+ line[n-1] = '=';
+- log_trace("Received: %.*s", (int) n, line);
+
+- r = iovw_put(&source->iovw, line, n);
+- if (r < 0) {
+- log_error("Failed to put line in iovect");
+- return r;
++ source->field_len = n;
++ source->state = STATE_DATA_START;
++
++ /* we cannot put the field in iovec until we have all data */
+ }
+
+- if (!sep)
+- source->state = STATE_DATA_START;
++ log_trace("Received: %.*s (%s)", (int) n, line, sep ? "text" : "binary");
++
+ return 0; /* continue */
+ }
+
+@@ -382,6 +385,7 @@ int process_data(RemoteSource *source) {
+
+ case STATE_DATA: {
+ void *data;
++ char *field;
+
+ assert(source->data_size > 0);
+
+@@ -396,11 +400,12 @@ int process_data(RemoteSource *source) {
+
+ assert(data);
+
+- r = iovw_put(&source->iovw, data, source->data_size);
+- if (r < 0) {
+- log_error("failed to put binary buffer in iovect");
++ field = (char*) data - sizeof(uint64_t) - source->field_len;
++ memmove(field + sizeof(uint64_t), field, source->field_len);
++
++ r = iovw_put(&source->iovw, field + sizeof(uint64_t), source->field_len + source->data_size);
++ if (r < 0)
+ return r;
+- }
+
+ source->state = STATE_DATA_FINISH;
+
+diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
+index 8499f4eb82..22db550913 100644
+--- a/src/journal-remote/journal-remote-parse.h
++++ b/src/journal-remote/journal-remote-parse.h
+@@ -42,7 +42,9 @@ typedef struct RemoteSource {
+ size_t offset; /* offset to the beginning of live data in the buffer */
+ size_t scanned; /* number of bytes since the beginning of data without a newline */
+ size_t filled; /* total number of bytes in the buffer */
+- size_t data_size; /* size of the binary data chunk being processed */
++
++ size_t field_len; /* used for binary fields: the field name length */
++ size_t data_size; /* and the size of the binary data chunk being processed */
+
+ struct iovec_wrapper iovw;
+
diff --git a/0023-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/0023-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
new file mode 100644
index 0000000..5d07ced
--- /dev/null
+++ b/0023-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
@@ -0,0 +1,34 @@
+From 983c520982b548c9bb8f2689a93f2fb35c54c392 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez at opensuse.org>
+Date: Sun, 1 Mar 2015 21:13:10 -0300
+Subject: [PATCH] journal: fix Inappropriate ioctl for device on ext4
+
+Logs constantly show
+
+systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device
+
+This is because ext4 does not support FS_NOCOW_FL.
+
+[zj: fold into one conditional as suggested on the ML and
+ fix (preexisting) r/errno confusion in error message.]
+
+(cherry picked from commit 65eae3b76243d2dfd869f8c43b787575f7b4b994)
+---
+ src/journal/journal-file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 2845e05ce0..0f28718b0e 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -2611,8 +2611,8 @@ int journal_file_open(
+ * shouldn't be too bad, given that we do our own
+ * checksumming). */
+ r = chattr_fd(f->fd, true, FS_NOCOW_FL);
+- if (r < 0)
+- log_warning_errno(errno, "Failed to set file attributes: %m");
++ if (r < 0 && r != -ENOTTY)
++ log_warning_errno(r, "Failed to set file attributes: %m");
+
+ /* Let's attach the creation time to the journal file,
+ * so that the vacuuming code knows the age of this
diff --git a/0024-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch b/0024-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
new file mode 100644
index 0000000..2f3a49a
--- /dev/null
+++ b/0024-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
@@ -0,0 +1,49 @@
+From 3f0c8096f3d5e3b37d6e0e26f0562c1a8669f0d8 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Mon, 2 Mar 2015 20:55:38 +0100
+Subject: [PATCH] sd-daemon: replace VLA with alloca(), to make llvm happy
+
+https://bugs.freedesktop.org/show_bug.cgi?id=89379
+(cherry picked from commit d4a144fadf89bca681724c6c9a65b4a165fa0f90)
+---
+ src/libsystemd/sd-daemon/sd-daemon.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
+index 028c2a7a5b..22a3a5347a 100644
+--- a/src/libsystemd/sd-daemon/sd-daemon.c
++++ b/src/libsystemd/sd-daemon/sd-daemon.c
+@@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ .msg_iovlen = 1,
+ .msg_name = &sockaddr,
+ };
+- union {
+- struct cmsghdr cmsghdr;
+- uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
+- CMSG_SPACE(sizeof(int) * n_fds)];
+- } control;
++ struct cmsghdr *control;
+ _cleanup_close_ int fd = -1;
+ struct cmsghdr *cmsg = NULL;
+ const char *e;
+@@ -400,8 +396,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
+
++ control = alloca(CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int) * n_fds));
++
+ if (n_fds > 0) {
+- msghdr.msg_control = &control;
++ msghdr.msg_control = control;
+ msghdr.msg_controllen = CMSG_LEN(sizeof(int) * n_fds);
+
+ cmsg = CMSG_FIRSTHDR(&msghdr);
+@@ -418,7 +416,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ try_without_ucred = true;
+ controllen_without_ucred = msghdr.msg_controllen;
+
+- msghdr.msg_control = &control;
++ msghdr.msg_control = control;
+ msghdr.msg_controllen += CMSG_LEN(sizeof(struct ucred));
+
+ if (cmsg)
diff --git a/0025-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch b/0025-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
new file mode 100644
index 0000000..ae3a187
--- /dev/null
+++ b/0025-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
@@ -0,0 +1,80 @@
+From 5fb87c4b6582ddb0a0ab1f31300eae69ab963afb Mon Sep 17 00:00:00 2001
+From: Hans-Peter Deifel <hpd at hpdeifel.de>
+Date: Tue, 3 Mar 2015 00:35:08 +0100
+Subject: [PATCH] tmpfiles: quietly ignore ACLs on unsupported filesystems
+
+A warning is printed if ACLs cannot be retrieved for any reason other
+than -ENOSYS. For -ENOSYS, debug log is printed.
+
+(cherry picked from commit d873e8778c92014c02a9122852758b436fa95c0e)
+---
+ src/tmpfiles/tmpfiles.c | 36 ++++++++++++++++++++----------------
+ 1 file changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 88ba7e46a2..187997e1f4 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -704,6 +704,9 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
+ int r;
+ _cleanup_(acl_free_charpp) char *t = NULL;
+
++ /* Returns 0 for success, positive error if already warned,
++ * negative error otherwise. */
++
+ if (modify) {
+ r = acls_for_file(path, type, acl, &dup);
+ if (r < 0)
+@@ -731,35 +734,36 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
+
+ r = acl_set_file(path, type, dup);
+ if (r < 0)
+- return log_error_errno(-errno,
+- "Setting %s ACL \"%s\" on %s failed: %m",
+- type == ACL_TYPE_ACCESS ? "access" : "default",
+- strna(t), path);
++ return -log_error_errno(errno,
++ "Setting %s ACL \"%s\" on %s failed: %m",
++ type == ACL_TYPE_ACCESS ? "access" : "default",
++ strna(t), path);
++
+ return 0;
+ }
+ #endif
+
+ static int path_set_acls(Item *item, const char *path) {
++ int r = 0;
+ #ifdef HAVE_ACL
+- int r;
+-
+ assert(item);
+ assert(path);
+
+- if (item->acl_access) {
++ if (item->acl_access)
+ r = path_set_acl(path, ACL_TYPE_ACCESS, item->acl_access, item->force);
+- if (r < 0)
+- return r;
+- }
+
+- if (item->acl_default) {
++ if (r == 0 && item->acl_default)
+ r = path_set_acl(path, ACL_TYPE_DEFAULT, item->acl_default, item->force);
+- if (r < 0)
+- return r;
+- }
+-#endif
+
+- return 0;
++ if (r > 0)
++ return -r; /* already warned */
++ else if (r == -ENOTSUP) {
++ log_debug_errno(r, "ACLs not supported by file system at %s", path);
++ return 0;
++ } else if (r < 0)
++ log_error_errno(r, "ACL operation on \"%s\" failed: %m", path);
++#endif
++ return r;
+ }
+
+ static int write_one_file(Item *i, const char *path) {
diff --git a/0026-shared-util-assume-ac-when-sys-class-power_supply-is.patch b/0026-shared-util-assume-ac-when-sys-class-power_supply-is.patch
new file mode 100644
index 0000000..92aa87c
--- /dev/null
+++ b/0026-shared-util-assume-ac-when-sys-class-power_supply-is.patch
@@ -0,0 +1,27 @@
+From 0436d5c5f4b39ba8177437fa92f082f8ef1830fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Tue, 3 Mar 2015 19:07:28 -0500
+Subject: [PATCH] shared/util: assume ac when /sys/class/power_supply is
+ missing
+
+On s390 (at least) /sys/class/power_supply is not present. We should
+treat this like if this directory was empty, and not an error.
+
+(cherry picked from commit 6d89003462484c8656b698e07b9cf0a337e3818e)
+---
+ src/shared/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index f24b5b4ec5..85487230a2 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -5994,7 +5994,7 @@ int on_ac_power(void) {
+
+ d = opendir("/sys/class/power_supply");
+ if (!d)
+- return -errno;
++ return errno == ENOENT ? true : -errno;
+
+ for (;;) {
+ struct dirent *de;
diff --git a/systemd.spec b/systemd.spec
index e052974..a94a2f3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219
-Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release: 6%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -41,9 +41,33 @@ Source8: systemd-journal-gatewayd.xml
# Patch series is available from http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v219-stable
# GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v219..v219-stable
# i=1; for p in 0*patch;do printf "Patch%04d: %s\n" $i $p; ((i++));done
+Patch0001: 0001-journal-remote-fix-certificate-status-memory-leak.patch
+Patch0002: 0002-journal-remote-fix-client_cert-memory-leak.patch
+Patch0003: 0003-tmpfiles-Fix-parse_acl-error-message.patch
+Patch0004: 0004-test-utf8-fix-utf16-tests-on-BE-machines.patch
+Patch0005: 0005-tmpfiles-avoid-creating-duplicate-acl-entries.patch
+Patch0006: 0006-shared-time-util-fix-gcc5-warning.patch
+Patch0007: 0007-test-time-test-infinity-parsing-in-nanoseconds.patch
+Patch0008: 0008-bootchart-fix-default-init-path.patch
+Patch0009: 0009-systemctl-bump-NOFILE-only-for-systemctl_main.patch
+Patch0010: 0010-acl-util-avoid-freeing-uninitialized-pointer.patch
+Patch0011: 0011-bootchart-svg-fix-checking-of-list-end.patch
+Patch0012: 0012-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
+Patch0013: 0013-unit-use-weaker-dependencies-between-mount-and-devic.patch
+Patch0014: 0014-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
+Patch0015: 0015-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
+Patch0016: 0016-sysctl-add-some-hints-how-to-override-settings.patch
+Patch0017: 0017-core-rework-device-state-logic.patch
+Patch0018: 0018-core-fix-return-value-on-OOM.patch
+Patch0019: 0019-machined-use-x-machine-unix-prefix-for-the-container.patch
+Patch0020: 0020-shared-AFS-is-also-a-network-filesystem.patch
+Patch0021: 0021-core-downgrade-unit-type-not-supported-message.patch
+Patch0022: 0022-journal-remote-fix-saving-of-binary-fields.patch
+Patch0023: 0023-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
+Patch0024: 0024-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
+Patch0025: 0025-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
+Patch0026: 0026-shared-util-assume-ac-when-sys-class-power_supply-is.patch
-Patch998: 0001-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
-Patch999: 0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
# kernel-install patch for grubby, drop if grubby is obsolete
Patch1000: kernel-install-grubby.patch
@@ -866,7 +890,12 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
/usr/lib/firewalld/services/*
%changelog
-* Tue Feb 24 2015 Colin Walters <walters at redhat.com> - 219-6
+* Tue Mar 3 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 219-6
+- Reworked device handling (#1195761)
+- ACL handling fixes
+- Various log messages downgraded (#1184712)
+
+* Tue Feb 24 2015 Colin Walters <walters at redhat.com> - 219-5
- Revert patch that breaks Atomic/OSTree (#1195761)
* Fri Feb 20 2015 Michal Schmidt <mschmidt at redhat.com> - 219-4
More information about the scm-commits
mailing list