From b0438462089d1e1460429a57718305de08985908 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 24 Mar 2015 00:52:59 +0100 Subject: fstab-generator: Support root on tmpfs (or other deviceless FS) This allows for stateless systems. --- src/fstab-generator/fstab-generator.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/fstab-generator') diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 2ece12f792..77c97fdb29 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -397,15 +397,20 @@ static int add_root_mount(void) { _cleanup_free_ char *what = NULL; const char *opts; - if (isempty(arg_root_what)) { - log_debug("Could not find a root= entry on the kernel command line."); - return 0; - } + if (fstype_is_deviceless(arg_root_fstype)) { + if (free_and_strdup(&what, arg_root_what) < 0) + return log_oom(); + } else { + if (isempty(arg_root_what)) { + log_debug("Could not find a root= entry on the kernel command line."); + return 0; + } - what = fstab_node_to_udev_node(arg_root_what); - if (!path_is_absolute(what)) { - log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype)); - return 0; + what = fstab_node_to_udev_node(arg_root_what); + if (!path_is_absolute(what)) { + log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype)); + return 0; + } } if (!arg_root_options) -- cgit v1.2.3-54-g00ecf