summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2014-09-03 13:31:25 +0200
committerHarald Hoyer <harald@redhat.com>2014-11-06 15:28:42 +0100
commit6d0f91bf551464c57bc12f99deccd515fb3f628d (patch)
treeb558ebf05e10beb6d86f38cfad2d1ae5e976f757 /src
parent2b671e9560d5a7e78374a33acfc7f089cfa05c2f (diff)
switch_root: do not fail, if base_filesystem_create() failed
Not all switch roots are like base_filesystem_create() wants them to look like. They might even boot, if they are RO and don't have the FS layout. Just ignore the error and switch_root nevertheless. base_filesystem_create() should have logged, what went wrong.
Diffstat (limited to 'src')
-rw-r--r--src/shared/switch-root.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index bac0e5c349..1a558b897b 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -47,7 +47,6 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
struct stat new_root_stat;
bool old_root_remove;
const char *i, *temporary_old_root;
- int r;
if (path_equal(new_root, "/"))
return 0;
@@ -103,11 +102,7 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
}
}
- r = base_filesystem_create(new_root);
- if (r < 0) {
- log_error("Failed to create the base filesystem: %s", strerror(-r));
- return r;
- }
+ (void) base_filesystem_create(new_root);
if (chdir(new_root) < 0) {
log_error("Failed to change directory to %s: %m", new_root);