summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fstab-generator/fstab-generator.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 63c36b5f94..98772fb56b 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -402,7 +402,8 @@ static int parse_fstab(bool initrd) {
}
static int add_root_mount(void) {
- _cleanup_free_ char *o = NULL, *what = NULL;
+ _cleanup_free_ char *what = NULL;
+ const char *opts;
if (isempty(arg_root_what)) {
log_debug("Could not find a root= entry on the kernel commandline.");
@@ -416,23 +417,19 @@ static int add_root_mount(void) {
}
if (!arg_root_options)
- o = strdup(arg_root_rw > 0 ? "rw" : "ro");
- else {
- if (arg_root_rw >= 0 ||
- (!mount_test_option(arg_root_options, "ro") &&
- !mount_test_option(arg_root_options, "rw")))
- o = strjoin(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro", NULL);
- else
- o = strdup(arg_root_options);
- }
- if (!o)
- return log_oom();
+ opts = arg_root_rw > 0 ? "rw" : "ro";
+ else if (arg_root_rw >= 0 ||
+ (!mount_test_option(arg_root_options, "ro") &&
+ !mount_test_option(arg_root_options, "rw")))
+ opts = strappenda3(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+ else
+ opts = arg_root_options;
log_debug("Found entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
return add_mount(what,
"/sysroot",
arg_root_fstype,
- o,
+ opts,
1,
false,
false,
@@ -518,6 +515,8 @@ int main(int argc, char *argv[]) {
if (arg_fstab_enabled) {
int k;
+ log_debug("Parsing /etc/fstab");
+
/* Parse the local /etc/fstab, possibly from the initrd */
k = parse_fstab(false);
if (k < 0)
@@ -525,6 +524,8 @@ int main(int argc, char *argv[]) {
/* If running in the initrd also parse the /etc/fstab from the host */
if (in_initrd()) {
+ log_debug("Parsing /sysroot/etc/fstab");
+
k = parse_fstab(true);
if (k < 0)
r = k;