mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
fstab-generator: simplify add_root_mount
This commit is contained in:
parent
9fcdf32294
commit
75a59316ea
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user