picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fstab-generator: when running in a container, ignore fstab entries referring to device nodes 

Since these device nodes will never appear in the container anyway
there's no point in waiting for them.

This makes it easier to boot images generated with general purpose
installers like Anaconda which unconditionally populate /etc/fstab to
boot in containers.
This commit is contained in:
Lennart Poettering 2014-03-11 17:57:15 +01:00
parent 7a249d0c1b
commit 689aede8c6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fstab-generator/fstab-generator.c
View File

@ -35,6 +35,7 @@
#include "fileio.h"
#include "generator.h"
#include "strv.h"
#include "virt.h"
static const char *arg_dest = "/tmp";
static bool arg_fstab_enabled = true;
@ -77,6 +78,11 @@ static int add_swap(const char *what, struct mntent *me) {
assert(what);
assert(me);
if (detect_container(NULL) > 0) {
log_info("Running in a container, ignoring fstab swap entry for %s.", what);
return 0;
}
r = mount_find_pri(me, &pri);
if (r < 0) {
log_error("Failed to parse priority");
@ -341,6 +347,11 @@ static int parse_fstab(bool initrd) {
if (!what)
return log_oom();
if (detect_container(NULL) > 0 && is_device_path(what)) {
log_info("Running in a container, ignoring fstab device entry for %s.", what);
continue;
}
where = initrd ? strappend("/sysroot/", me->mnt_dir) : strdup(me->mnt_dir);
if (!where)
return log_oom();