From a5d56a7fe1baafdd2464d544eb25a5619e488883b9160bf37192a922842780c1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 25 Aug 2014 09:47:11 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754 --- ...ation-of-machine-names-in-interface-.patch | 31 ++++++ ...h-root-umount-the-old-root-correctly.patch | 26 +++++ ...ot-OK-to-return-1-from-a-main-progra.patch | 27 ++++++ ...llocation-if-query-ids-never-reuse-t.patch | 45 +++++++++ ...crease-the-SendBuffer-of-dev-log-to-.patch | 23 +++++ ...counting-of-early-mounts-without-SMA.patch | 32 +++++++ ...-by-one-error-in-Missed-X-kernel-mes.patch | 29 ++++++ ...-t-kill-the-unit-when-killing-the-le.patch | 32 +++++++ ...o-logic-when-applied-relative-to-ser.patch | 93 ++++++++++++++++++ ...-bit-more-NFS-compatible-when-checki.patch | 36 +++++++ ...press-ID_PATH-for-devices-with-an-un.patch | 96 +++++++++++++++++++ systemd-mini.changes | 16 ++++ systemd-mini.spec | 33 +++++++ systemd.changes | 16 ++++ systemd.spec | 33 +++++++ 15 files changed, 568 insertions(+) create mode 100644 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch create mode 100644 0002-switch-root-umount-the-old-root-correctly.patch create mode 100644 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch create mode 100644 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch create mode 100644 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch create mode 100644 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch create mode 100644 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch create mode 100644 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch create mode 100644 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch create mode 100644 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch create mode 100644 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch diff --git a/0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch b/0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch new file mode 100644 index 00000000..4378b91f --- /dev/null +++ b/0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch @@ -0,0 +1,31 @@ +Based on 4212a3375e03fd12cb407b34cab59dbe4ed9f4eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 3 Aug 2014 01:28:21 -0400 +Subject: [PATCH] nspawn: fix truncation of machine names in interface names + +Based on patch by Michael Marineau : + +When deriving the network interface name from machine name strncpy was +not properly null terminating the string and the maximum string size as +returned by strlen() is actually IFNAMSIZ-1, not IFNAMSIZ. +--- + src/nspawn/nspawn.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- src/nspawn/nspawn.c ++++ src/nspawn/nspawn.c 2014-08-22 10:18:20.390235611 +0000 +@@ -1383,12 +1383,8 @@ static int setup_veth(pid_t pid, char if + + /* Use two different interface name prefixes depending whether + * we are in bridge mode or not. */ +- if (arg_network_bridge) +- memcpy(iface_name, "vb-", 3); +- else +- memcpy(iface_name, "ve-", 3); +- +- strncpy(iface_name+3, arg_machine, IFNAMSIZ - 3); ++ snprintf(iface_name, IFNAMSIZ, "%s-%s", ++ arg_network_bridge ? "vb" : "ve", arg_machine); + + r = sd_rtnl_open(&rtnl, 0); + if (r < 0) { diff --git a/0002-switch-root-umount-the-old-root-correctly.patch b/0002-switch-root-umount-the-old-root-correctly.patch new file mode 100644 index 00000000..df79c8f0 --- /dev/null +++ b/0002-switch-root-umount-the-old-root-correctly.patch @@ -0,0 +1,26 @@ +Based on 23f25b1496c31ef4c20b8f3ee8328f7b1d5f3a54 Mon Sep 17 00:00:00 2001 +From: Dan Dedrick +Date: Tue, 29 Jul 2014 15:31:23 -0400 +Subject: [PATCH] switch-root: umount the old root correctly + +The unmount occurs after the pivot_root, so the path used to unmount +should take into account the new root directory. This will allow the +umount to actually succeed. +--- + src/core/switch-root.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- src/core/switch-root.c ++++ src/core/switch-root.c 2014-08-22 11:22:50.230735231 +0000 +@@ -122,9 +122,9 @@ int switch_root(const char *new_root) { + + /* Immediately get rid of the old root. Since we are + * running off it we need to do this lazily. */ +- if (umount2(temporary_old_root, MNT_DETACH) < 0) { ++ if (umount2("/mnt", MNT_DETACH) < 0) { + r = -errno; +- log_error("Failed to umount old root dir %s: %m", temporary_old_root); ++ log_error("Failed to umount old root dir /mnt: %m"); + goto fail; + } + diff --git a/0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch b/0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch new file mode 100644 index 00000000..9796af4f --- /dev/null +++ b/0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch @@ -0,0 +1,27 @@ +From 4155f7d4be5053d5f34a26e5437fd85e1fe00fa3 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 11 Aug 2014 18:23:47 +0200 +Subject: [PATCH] bootchart: it's not OK to return -1 from a main program + +--- + src/bootchart/bootchart.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git src/bootchart/bootchart.c src/bootchart/bootchart.c +index c0e176d..8ef5ad1 100644 +--- src/bootchart/bootchart.c ++++ src/bootchart/bootchart.c +@@ -380,8 +380,8 @@ int main(int argc, char *argv[]) { + + sampledata = new0(struct list_sample_data, 1); + if (sampledata == NULL) { +- log_error("Failed to allocate memory for a node: %m"); +- return -1; ++ log_oom(); ++ return EXIT_FAILURE; + } + + sampledata->sampletime = gettime_ns(); +-- +1.7.9.2 + diff --git a/0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch b/0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch new file mode 100644 index 00000000..5dfa4ed5 --- /dev/null +++ b/0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch @@ -0,0 +1,45 @@ +Based on 85529c815b47c22839e0f148af67fd37e977cbfa Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 12 Aug 2014 19:29:27 +0200 +Subject: [PATCH] sd-resolve: fix allocation if query ids, never reuse them + +--- + src/libsystemd/sd-resolve/sd-resolve.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +--- src/libsystemd/sd-resolve/sd-resolve.c ++++ src/libsystemd/sd-resolve/sd-resolve.c 2014-08-22 14:18:24.838235343 +0000 +@@ -81,7 +81,7 @@ struct sd_resolve { + pthread_t workers[WORKERS_MAX]; + unsigned n_valid_workers; + +- unsigned current_id, current_index; ++ unsigned current_id; + sd_resolve_query* queries[QUERIES_MAX]; + unsigned n_queries; + +@@ -892,21 +892,17 @@ static int alloc_query(sd_resolve *resol + if (r < 0) + return r; + +- while (resolve->queries[resolve->current_index]) { +- resolve->current_index++; ++ while (resolve->queries[resolve->current_id % QUERIES_MAX]) + resolve->current_id++; + +- resolve->current_index %= QUERIES_MAX; +- } +- +- q = resolve->queries[resolve->current_index] = new0(sd_resolve_query, 1); ++ q = resolve->queries[resolve->current_id % QUERIES_MAX] = new0(sd_resolve_query, 1); + if (!q) + return -ENOMEM; + + resolve->n_queries++; + + q->resolve = resolve; +- q->id = resolve->current_id; ++ q->id = resolve->current_id++; + + *_q = q; + return 0; diff --git a/0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch b/0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch new file mode 100644 index 00000000..54b97960 --- /dev/null +++ b/0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch @@ -0,0 +1,23 @@ +Based on 5e8b767df6e18444d5aff2987b5e5603361ed528 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 13 Aug 2014 18:53:05 +0200 +Subject: [PATCH] journald: also increase the SendBuffer of /dev/log to 8M + +http://lists.freedesktop.org/archives/systemd-devel/2014-August/021825.html +--- + units/systemd-journald.socket | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- units/systemd-journald.socket ++++ units/systemd-journald.socket 2014-08-22 14:31:11.022236471 +0000 +@@ -23,4 +23,10 @@ ListenDatagram=/dev/log + SocketMode=0666 + PassCredentials=yes + PassSecurity=yes ++ ++# Increase both the send and receive buffer, so that things don't ++# block early. Note that journald internally uses the this socket both ++# for receiving syslog messages, and for forwarding them to any other ++# syslog, hence we bump both values. + ReceiveBuffer=8M ++SendBuffer=8M diff --git a/0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch b/0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch new file mode 100644 index 00000000..b189c671 --- /dev/null +++ b/0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch @@ -0,0 +1,32 @@ +From 7c96ab1d2484ab2df3c6a84f1a1d2e076f469085 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 13 Aug 2014 20:01:19 +0200 +Subject: [PATCH] mount-setup: fix counting of early mounts without SMACK + +http://lists.freedesktop.org/archives/systemd-devel/2014-August/021772.html +--- + src/core/mount-setup.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git src/core/mount-setup.c src/core/mount-setup.c +index 206f89a..cc2633e 100644 +--- src/core/mount-setup.c ++++ src/core/mount-setup.c +@@ -63,8 +63,13 @@ typedef struct MountPoint { + + /* The first three entries we might need before SELinux is up. The + * fourth (securityfs) is needed by IMA to load a custom policy. The +- * other ones we can delay until SELinux and IMA are loaded. */ ++ * other ones we can delay until SELinux and IMA are loaded. When ++ * SMACK is enabled we need smackfs, too, so it's a fifth one. */ ++#ifdef HAVE_SMACK + #define N_EARLY_MOUNT 5 ++#else ++#define N_EARLY_MOUNT 4 ++#endif + + static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, +-- +1.7.9.2 + diff --git a/0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch b/0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch new file mode 100644 index 00000000..864b9982 --- /dev/null +++ b/0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch @@ -0,0 +1,29 @@ +From b9c488f60050248b35640f28e4d00958702ba1c3 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Wed, 6 Aug 2014 13:14:51 +0200 +Subject: [PATCH] journald: Fix off-by-one error in "Missed X kernel messages" + warning + +On receiving a message, "kernel_seqnum" is set to "serial + 1". So +subtracting 1 will cause messages like "Missed 0 kernel messages", +which should be "Missed 1 kernel messages". +--- + src/journal/journald-kmsg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/journal/journald-kmsg.c src/journal/journald-kmsg.c +index 9935986..fb8ea08 100644 +--- src/journal/journald-kmsg.c ++++ src/journal/journald-kmsg.c +@@ -152,7 +152,7 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) { + /* Did we lose any? */ + if (serial > *s->kernel_seqnum) + server_driver_message(s, SD_MESSAGE_JOURNAL_MISSED, "Missed %"PRIu64" kernel messages", +- serial - *s->kernel_seqnum - 1); ++ serial - *s->kernel_seqnum); + + /* Make sure we never read this one again. Note that + * we always store the next message serial we expect +-- +1.7.9.2 + diff --git a/0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch b/0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch new file mode 100644 index 00000000..cd65acf9 --- /dev/null +++ b/0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch @@ -0,0 +1,32 @@ +From 9d685ca8193c0da3ad5746be3871f5350179a3b3 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Thu, 14 Aug 2014 19:59:16 +0200 +Subject: [PATCH] machine_kill(): Don't kill the unit when killing the leader + +If "machinectl poweroff" or "machinectl reboot" is used on a +systemd-nspawn container started with --keep-unit and --register, it +should *only* send the appropriate signal to the leader PID (i.e. the +container's systemd process). It shouldn't fall through to +manager_kill_unit() to also send the signal to the unit. The latter +ends up killing systemd-nspawn, which takes down the container +prematurely. +--- + src/machine/machine.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git src/machine/machine.c src/machine/machine.c +index 1c9177e..13d3448 100644 +--- src/machine/machine.c ++++ src/machine/machine.c +@@ -493,6 +493,8 @@ int machine_kill(Machine *m, KillWho who, int signo) { + + if (kill(m->leader, signo) < 0) + return -errno; ++ ++ return 0; + } + + /* Otherwise make PID 1 do it for us, for the entire cgroup */ +-- +1.7.9.2 + diff --git a/0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch b/0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch new file mode 100644 index 00000000..7dee5011 --- /dev/null +++ b/0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch @@ -0,0 +1,93 @@ +From ff50244582bf69e8489bba6ce59a21663d7f8274 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 18 Aug 2014 22:21:42 +0200 +Subject: [PATCH] units: fix BindsTo= logic when applied relative to services + with Type=oneshot +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Start jobs for Type=oneshot units are successful when the unit state +transition activating → inactive took place. In such a case all units +that BindsTo= on it previously would continue to run, even though the unit +they dependet on was actually already gone. +--- + src/core/unit.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 44 insertions(+), 4 deletions(-) + +diff --git src/core/unit.c src/core/unit.c +index a5f6b2e..950b83a 100644 +--- src/core/unit.c ++++ src/core/unit.c +@@ -1471,12 +1471,44 @@ static void unit_check_unneeded(Unit *u) { + if (unit_active_or_pending(other)) + return; + +- log_info_unit(u->id, "Service %s is not needed anymore. Stopping.", u->id); ++ log_info_unit(u->id, "Unit %s is not needed anymore. Stopping.", u->id); + + /* Ok, nobody needs us anymore. Sniff. Then let's commit suicide */ + manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL); + } + ++static void unit_check_binds_to(Unit *u) { ++ bool stop = false; ++ Unit *other; ++ Iterator i; ++ ++ assert(u); ++ ++ if (u->job) ++ return; ++ ++ if (unit_active_state(u) != UNIT_ACTIVE) ++ return; ++ ++ SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i) { ++ if (other->job) ++ continue; ++ ++ if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) ++ continue; ++ ++ stop = true; ++ } ++ ++ if (!stop) ++ return; ++ ++ log_info_unit(u->id, "Unit %s is bound to inactive service. Stopping, too.", u->id); ++ ++ /* 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); ++} ++ + static void retroactively_start_dependencies(Unit *u) { + Iterator i; + Unit *other; +@@ -1788,11 +1820,19 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su + manager_recheck_journal(m); + unit_trigger_notify(u); + +- /* Maybe we finished startup and are now ready for being +- * stopped because unneeded? */ +- if (u->manager->n_reloading <= 0) ++ if (u->manager->n_reloading <= 0) { ++ /* Maybe we finished startup and are now ready for ++ * being stopped because unneeded? */ + unit_check_unneeded(u); + ++ /* Maybe we finished startup, but something we needed ++ * has vanished? Let's die then. (This happens when ++ * something BindsTo= to a Type=oneshot unit, as these ++ * units go directly from starting to inactive, ++ * without ever entering started.) */ ++ unit_check_binds_to(u); ++ } ++ + unit_add_to_dbus_queue(u); + unit_add_to_gc_queue(u); + } +-- +1.7.9.2 + diff --git a/0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch b/0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch new file mode 100644 index 00000000..becc7844 --- /dev/null +++ b/0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch @@ -0,0 +1,36 @@ +From 70421bdce2719d76efffd8afdc28433c75aac5a2 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 18 Aug 2014 23:15:51 +0200 +Subject: [PATCH] util: try to be a bit more NFS compatible when checking + whether an FS is writable + +https://bugs.freedesktop.org/show_bug.cgi?id=81169 +--- + src/shared/path-util.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git src/shared/path-util.c src/shared/path-util.c +index 57554cd..67566bc 100644 +--- src/shared/path-util.c ++++ src/shared/path-util.c +@@ -533,7 +533,16 @@ int path_is_read_only_fs(const char *path) { + if (statvfs(path, &st) < 0) + return -errno; + +- return !!(st.f_flag & ST_RDONLY); ++ if (st.f_flag & ST_RDONLY) ++ return true; ++ ++ /* On NFS, statvfs() might not reflect whether we can actually ++ * write to the remote share. Let's try again with ++ * access(W_OK) which is more reliable, at least sometimes. */ ++ if (access(path, W_OK) < 0 && errno == EROFS) ++ return true; ++ ++ return false; + } + + int path_is_os_tree(const char *path) { +-- +1.7.9.2 + diff --git a/1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch b/1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch new file mode 100644 index 00000000..06966c4c --- /dev/null +++ b/1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch @@ -0,0 +1,96 @@ +Based on e98bbfd2074e2b1079b7059341eac25741baf319 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Mon, 4 Aug 2014 18:15:34 +0200 +Subject: [PATCH] udev: path_id - suppress ID_PATH for devices with an unknown + parent device type + +https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1321816 +--- + src/udev/udev-builtin-path_id.c | 38 +++++++++++++++++++++++++++----------- + 1 file changed, 27 insertions(+), 11 deletions(-) + +--- src/udev/udev-builtin-path_id.c ++++ src/udev/udev-builtin-path_id.c 2014-08-22 14:08:59.250235369 +0000 +@@ -524,7 +524,8 @@ static int builtin_path_id(struct udev_d + { + struct udev_device *parent; + char *path = NULL; +- bool some_transport = false; ++ bool supported_transport = false; ++ bool supported_parent = false; + + /* S390 ccw bus */ + parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL); +@@ -545,47 +546,62 @@ static int builtin_path_id(struct udev_d + handle_scsi_tape(parent, &path); + } else if (streq(subsys, "scsi")) { + parent = handle_scsi(parent, &path); +- some_transport = true; ++ supported_transport = true; + } else if (streq(subsys, "cciss")) { + parent = handle_cciss(parent, &path); +- some_transport = true; ++ supported_transport = true; + } else if (streq(subsys, "usb")) { + parent = handle_usb(parent, &path); +- some_transport = true; ++ supported_transport = true; + } else if (streq(subsys, "bcma")) { + parent = handle_bcma(parent, &path); +- some_transport = true; ++ supported_transport = true; + } else if (streq(subsys, "serio")) { + path_prepend(&path, "serio-%s", udev_device_get_sysnum(parent)); + parent = skip_subsystem(parent, "serio"); + } else if (streq(subsys, "pci")) { + path_prepend(&path, "pci-%s", udev_device_get_sysname(parent)); + parent = skip_subsystem(parent, "pci"); ++ supported_parent = true; + } else if (streq(subsys, "platform")) { + path_prepend(&path, "platform-%s", udev_device_get_sysname(parent)); + parent = skip_subsystem(parent, "platform"); +- some_transport = true; ++ supported_transport = true; ++ supported_parent = true; + } else if (streq(subsys, "acpi")) { + path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent)); + parent = skip_subsystem(parent, "acpi"); ++ supported_parent = true; + } else if (streq(subsys, "xen")) { + path_prepend(&path, "xen-%s", udev_device_get_sysname(parent)); + parent = skip_subsystem(parent, "xen"); ++ supported_parent = true; + } else if (streq(subsys, "scm")) { + path_prepend(&path, "scm-%s", udev_device_get_sysname(parent)); + parent = skip_subsystem(parent, "scm"); +- some_transport = true; ++ supported_transport = true; ++ supported_parent = true; + } + + parent = udev_device_get_parent(parent); + } + + /* +- * Do not return a single-parent-device-only for block +- * devices, they might have entire buses behind it which +- * do not get unique IDs only by using the parent device. ++ * Do return devices with have an unknown type of parent device, they ++ * might produce conflicting IDs below multiple independent parent ++ * devices. + */ +- if (!some_transport && streq(udev_device_get_subsystem(dev), "block")) { ++ if (!supported_parent) { ++ free(path); ++ path = NULL; ++ } ++ ++ /* ++ * Do not return a have-only a single-parent block devices, some ++ * have entire hidden buses behind it, and not create predictable ++ * IDs that way. ++ */ ++ if (streq(udev_device_get_subsystem(dev), "block") && !supported_transport) { + free(path); + path = NULL; + } diff --git a/systemd-mini.changes b/systemd-mini.changes index 44a2debe..01312504 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Aug 22 15:12:23 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch + 0002-switch-root-umount-the-old-root-correctly.patch + 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch + 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch + 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch + 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch + 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch + 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch + 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch + 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch + 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch + ------------------------------------------------------------------- Fri Aug 22 01:29:06 UTC 2014 - crrodriguez@opensuse.org diff --git a/systemd-mini.spec b/systemd-mini.spec index 1cc43a17..712cd5db 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -764,6 +764,26 @@ Patch366: tomcat6-var-lock-subsys-legacy.patch Patch367: 0007-hwdb-update.patch # PATCH-FIX-SUSE Remove error messages for tab completion for systemctl isolate (bnc#892162) Patch368: 0001-let-systemctl-completion-ignore-at-names.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch369: 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch370: 0002-switch-root-umount-the-old-root-correctly.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch371: 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch372: 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch373: 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch374: 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch375: 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch376: 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch377: 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch378: 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch # UDEV PATCHES # ============ @@ -895,6 +915,8 @@ Patch1060: 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.p Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch +# PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch +Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1422,6 +1444,16 @@ cp %{SOURCE7} m4/ %patch366 -p1 %patch367 -p0 %patch368 -p1 +%patch369 -p0 +%patch370 -p0 +%patch371 -p0 +%patch372 -p0 +%patch373 -p0 +%patch374 -p0 +%patch375 -p0 +%patch376 -p0 +%patch377 -p0 +%patch378 -p0 # udev patches %patch1001 -p1 @@ -1507,6 +1539,7 @@ cp %{SOURCE7} m4/ %patch1060 -p1 %patch1061 -p0 %patch1062 -p1 +%patch1063 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 44a2debe..01312504 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Aug 22 15:12:23 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch + 0002-switch-root-umount-the-old-root-correctly.patch + 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch + 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch + 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch + 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch + 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch + 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch + 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch + 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch + 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch + ------------------------------------------------------------------- Fri Aug 22 01:29:06 UTC 2014 - crrodriguez@opensuse.org diff --git a/systemd.spec b/systemd.spec index 653b872c..e4fa15c9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -759,6 +759,26 @@ Patch366: tomcat6-var-lock-subsys-legacy.patch Patch367: 0007-hwdb-update.patch # PATCH-FIX-SUSE Remove error messages for tab completion for systemctl isolate (bnc#892162) Patch368: 0001-let-systemctl-completion-ignore-at-names.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch369: 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch370: 0002-switch-root-umount-the-old-root-correctly.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch371: 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch372: 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch373: 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch374: 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch375: 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch376: 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch377: 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch +# PATCH-FIX-UPSTREAM added at 2014/08/22 +Patch378: 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch # UDEV PATCHES # ============ @@ -890,6 +910,8 @@ Patch1060: 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.p Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch +# PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch +Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1417,6 +1439,16 @@ cp %{SOURCE7} m4/ %patch366 -p1 %patch367 -p0 %patch368 -p1 +%patch369 -p0 +%patch370 -p0 +%patch371 -p0 +%patch372 -p0 +%patch373 -p0 +%patch374 -p0 +%patch375 -p0 +%patch376 -p0 +%patch377 -p0 +%patch378 -p0 # udev patches %patch1001 -p1 @@ -1502,6 +1534,7 @@ cp %{SOURCE7} m4/ %patch1060 -p1 %patch1061 -p0 %patch1062 -p1 +%patch1063 -p0 # ensure generate files are removed rm -f units/emergency.service