shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-20 14:03:39 +03:00
Code

switch-root: umount the old root correctly

Browse Source 
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.

(cherry picked from commit 23f25b1496c31ef4c20b8f3ee8328f7b1d5f3a54)
This commit is contained in:
Dan Dedrick 2014-07-29 15:31:23 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent 32798abbc8
commit 8775f6d81b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/switch-root.c
View File

@ -129,8 +129,8 @@ 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) {
log_error("Failed to umount old root dir %s: %m", temporary_old_root);
if (umount2("/mnt", MNT_DETACH) < 0) {
log_error("Failed to umount old root dir /mnt: %m");
return -errno;
}