forked from pool/systemd
8d0e9d5913
- Add upstream patches for hwdb 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch 0003-keymap-Fix-HP-Pavillon-DV7.patch 0004-hwdb-update-format-description-and-document-reloadin.patch 0008-hwdb-update.patch - Port back and add the missed upstream patches from 2014/08/22 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch 0006-login-share-VT-signal-handler-between-sessions.patch - 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 - man pages from section 3 are developer docs, move them to the -devel package. - Add patch 0001-let-systemctl-completion-ignore-at-names.patch to remove error messages for tab completion for systemctl isolate (bnc#892162) OBS-URL: https://build.opensuse.org/request/show/246497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=200
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Based on 23f25b1496c31ef4c20b8f3ee8328f7b1d5f3a54 Mon Sep 17 00:00:00 2001
|
|
From: Dan Dedrick <dan.dedrick@gmail.com>
|
|
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;
|
|
}
|
|
|