summaryrefslogtreecommitdiff
path: root/src/fstab-generator/fstab-generator.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fstab-generator/fstab-generator.c')
-rw-r--r--src/fstab-generator/fstab-generator.c233
1 files changed, 147 insertions, 86 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index f3ecc24be6..c17299f267 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -33,6 +33,7 @@
#include "special.h"
#include "mkdir.h"
#include "virt.h"
+#include "fileio.h"
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
@@ -68,7 +69,7 @@ static int mount_find_pri(struct mntent *me, int *ret) {
errno = 0;
r = strtoul(pri, &end, 10);
- if (errno != 0)
+ if (errno > 0)
return -errno;
if (end == pri || (*end != ',' && *end != 0))
@@ -79,8 +80,8 @@ static int mount_find_pri(struct mntent *me, int *ret) {
}
static int add_swap(const char *what, struct mntent *me) {
- char _cleanup_free_ *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
- FILE _cleanup_fclose_ *f = NULL;
+ _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
bool noauto, nofail;
int r, pri = -1;
@@ -177,7 +178,9 @@ static bool mount_is_bind(struct mntent *me) {
return
hasmntopt(me, "bind") ||
- streq(me->mnt_type, "bind");
+ streq(me->mnt_type, "bind") ||
+ hasmntopt(me, "rbind") ||
+ streq(me->mnt_type, "rbind");
}
static bool mount_is_network(struct mntent *me) {
@@ -188,15 +191,34 @@ static bool mount_is_network(struct mntent *me) {
fstype_is_network(me->mnt_type);
}
-static int add_mount(const char *what, const char *where, const char *type, const char *opts,
- int passno, bool wait, bool noauto, bool nofail, bool automount, bool isbind, bool isnetwork,
- const char *source) {
- char _cleanup_free_
+static bool mount_in_initrd(struct mntent *me) {
+ assert(me);
+
+ return
+ hasmntopt(me, "x-initrd.mount") ||
+ streq(me->mnt_dir, "/usr");
+}
+
+static int add_mount(
+ const char *what,
+ const char *where,
+ const char *type,
+ const char *opts,
+ int passno,
+ bool noauto,
+ bool nofail,
+ bool automount,
+ bool isbind,
+ const char *pre,
+ const char *pre2,
+ const char *online,
+ const char *post,
+ const char *source) {
+ _cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
- FILE _cleanup_fclose_ *f = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
int r;
- const char *post, *pre;
assert(what);
assert(where);
@@ -216,14 +238,6 @@ static int add_mount(const char *what, const char *where, const char *type, cons
mount_point_ignore(where))
return 0;
- if (isnetwork) {
- post = SPECIAL_REMOTE_FS_TARGET;
- pre = SPECIAL_REMOTE_FS_PRE_TARGET;
- } else {
- post = SPECIAL_LOCAL_FS_TARGET;
- pre = SPECIAL_LOCAL_FS_PRE_TARGET;
- }
-
name = unit_name_from_path(where, ".mount");
if (!name)
return log_oom();
@@ -248,17 +262,30 @@ static int add_mount(const char *what, const char *where, const char *type, cons
"DefaultDependencies=no\n",
source);
- if (!path_equal(where, "/"))
+ if (!path_equal(where, "/")) {
+ if (pre)
+ fprintf(f,
+ "After=%s\n",
+ pre);
+
+ if (pre2)
+ fprintf(f,
+ "After=%s\n",
+ pre2);
+
+ if (online)
+ fprintf(f,
+ "After=%s\n"
+ "Wants=%s\n",
+ online,
+ online);
+
fprintf(f,
- "After=%s\n"
- "Wants=%s\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET "\n",
- pre,
- pre);
-
+ "Before=" SPECIAL_UMOUNT_TARGET "\n");
+ }
- if (!noauto && !nofail && !automount)
+ if (post && !noauto && !nofail && !automount)
fprintf(f,
"Before=%s\n",
post);
@@ -281,10 +308,6 @@ static int add_mount(const char *what, const char *where, const char *type, cons
"Options=%s\n",
opts);
- if (wait)
- fprintf(f,
- "TimeoutSec=0\n");
-
fflush(f);
if (ferror(f)) {
log_error("Failed to write unit file %s: %m", unit);
@@ -292,14 +315,16 @@ static int add_mount(const char *what, const char *where, const char *type, cons
}
if (!noauto) {
- lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
- if (!lnk)
- return log_oom();
+ if (post) {
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ if (!lnk)
+ return log_oom();
- mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
+ mkdir_parents_label(lnk, 0755);
+ if (symlink(unit, lnk) < 0) {
+ log_error("Failed to create symlink %s: %m", lnk);
+ return -errno;
+ }
}
if (!isbind &&
@@ -343,14 +368,20 @@ static int add_mount(const char *what, const char *where, const char *type, cons
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=/etc/fstab\n"
+ "SourcePath=%s\n"
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET " %s\n"
- "\n"
+ "Before=" SPECIAL_UMOUNT_TARGET "\n",
+ source);
+
+ if (post)
+ fprintf(f,
+ "Before= %s\n",
+ post);
+
+ fprintf(f,
"[Automount]\n"
"Where=%s\n",
- post,
where);
fflush(f);
@@ -374,27 +405,34 @@ static int add_mount(const char *what, const char *where, const char *type, cons
return 0;
}
-static int parse_fstab(void) {
+static int parse_fstab(const char *prefix, bool initrd) {
+ _cleanup_free_ char *fstab_path = NULL;
FILE *f;
int r = 0;
struct mntent *me;
- errno = 0;
- f = setmntent("/etc/fstab", "r");
+ fstab_path = strjoin(strempty(prefix), "/etc/fstab", NULL);
+ if (!fstab_path)
+ return log_oom();
+
+ f = setmntent(fstab_path, "r");
if (!f) {
if (errno == ENOENT)
return 0;
- log_error("Failed to open /etc/fstab: %m");
+ log_error("Failed to open %s/etc/fstab: %m", strempty(prefix));
return -errno;
}
while ((me = getmntent(f))) {
- char _cleanup_free_ *where = NULL, *what = NULL;
+ _cleanup_free_ char *where = NULL, *what = NULL;
int k;
+ if (initrd && !mount_in_initrd(me))
+ continue;
+
what = fstab_node_to_udev_node(me->mnt_fsname);
- where = strdup(me->mnt_dir);
+ where = strjoin(strempty(prefix), me->mnt_dir, NULL);
if (!what || !where) {
r = log_oom();
goto finish;
@@ -408,7 +446,8 @@ static int parse_fstab(void) {
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
else {
- bool noauto, nofail, automount, isbind, isnetwork;
+ bool noauto, nofail, automount, isbind;
+ const char *pre, *pre2, *post, *online;
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");
@@ -416,12 +455,27 @@ static int parse_fstab(void) {
hasmntopt(me, "comment=systemd.automount") ||
hasmntopt(me, "x-systemd.automount");
isbind = mount_is_bind(me);
- isnetwork = mount_is_network(me);
+
+ if (initrd) {
+ pre = pre2 = online = NULL;
+ post = SPECIAL_INITRD_FS_TARGET;
+ } else if (mount_in_initrd(me)) {
+ pre = pre2 = online = NULL;
+ post = SPECIAL_INITRD_ROOT_FS_TARGET;
+ } else if (mount_is_network(me)) {
+ pre = SPECIAL_REMOTE_FS_PRE_TARGET;
+ pre2 = SPECIAL_NETWORK_TARGET;
+ online = SPECIAL_NETWORK_ONLINE_TARGET;
+ post = SPECIAL_REMOTE_FS_TARGET;
+ } else {
+ pre = SPECIAL_LOCAL_FS_PRE_TARGET;
+ pre2 = online = NULL;
+ post = SPECIAL_LOCAL_FS_TARGET;
+ }
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, false, noauto, nofail,
- automount, isbind, isnetwork,
- "/etc/fstab");
+ me->mnt_passno, noauto, nofail, automount,
+ isbind, pre, pre2, online, post, fstab_path);
}
if (k < 0)
@@ -434,11 +488,10 @@ finish:
}
static int parse_new_root_from_proc_cmdline(void) {
- char *w, *state;
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
+ char *w, *state;
int r;
size_t l;
- bool wait = false;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@@ -446,15 +499,15 @@ static int parse_new_root_from_proc_cmdline(void) {
return 0;
}
- opts = strdup("defaults");
+ opts = strdup("ro");
type = strdup("auto");
if (!opts || !type)
return log_oom();
- /* root= and roofstype= may occur more than once, the last instance should take precedence.
- * In the case of multiple rootflags= the arguments should be concatenated */
+ /* root= and roofstype= may occur more than once, the last instance should take precedence.
+ * In the case of multiple rootflags= the arguments should be concatenated */
FOREACH_WORD_QUOTED(w, l, line, state) {
- char *word, *tmp_word;
+ _cleanup_free_ char *word;
word = strndup(w, l);
if (!word)
@@ -473,41 +526,46 @@ static int parse_new_root_from_proc_cmdline(void) {
return log_oom();
} else if (startswith(word, "rootflags=")) {
- tmp_word = opts;
- opts = strjoin(opts, ",", word + 10, NULL);
- free(tmp_word);
- if (!opts)
+ char *o;
+
+ o = strjoin(opts, ",", word + 10, NULL);
+ if (!o)
return log_oom();
+ free(opts);
+ opts = o;
+
} else if (streq(word, "ro") || streq(word, "rw")) {
- tmp_word = opts;
- opts = strjoin(opts, ",", word, NULL);
- free(tmp_word);
- if (!opts)
- return log_oom();
+ char *o;
- } else if (streq(word, "rootwait"))
- wait = true;
+ o = strjoin(opts, ",", word, NULL);
+ if (!o)
+ return log_oom();
- free(word);
+ free(opts);
+ opts = o;
+ }
}
- if (what) {
+ if (!what) {
+ log_debug("Could not find a root= entry on the kernel commandline.");
+ return 0;
+ }
- log_debug("Found entry what=%s where=/new_root type=%s", what, type);
- r = add_mount(what, "/new_root", type, opts, 0, wait, false, false,
- false, false, false, "/proc/cmdline");
+ if (what[0] != '/') {
+ log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type);
+ return 0;
+ }
- if (r < 0)
- return r;
- } else
- log_error("Could not find a root= entry on the kernel commandline.");
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+ r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
+ false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
- return 0;
+ return (r < 0) ? r : 0;
}
static int parse_proc_cmdline(void) {
- char _cleanup_free_ *line = NULL;
+ _cleanup_free_ char *line = NULL;
char *w, *state;
int r;
size_t l;
@@ -522,7 +580,7 @@ static int parse_proc_cmdline(void) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
- char _cleanup_free_ *word = NULL;
+ _cleanup_free_ char *word = NULL;
word = strndup(w, l);
if (!word)
@@ -556,7 +614,7 @@ static int parse_proc_cmdline(void) {
}
int main(int argc, char *argv[]) {
- int r, k = 0;
+ int r = 0, k, l = 0;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
@@ -576,12 +634,15 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
if (in_initrd())
- k = parse_new_root_from_proc_cmdline();
+ r = parse_new_root_from_proc_cmdline();
if (!arg_enabled)
- return EXIT_SUCCESS;
+ return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+
+ k = parse_fstab(NULL, false);
- r = parse_fstab();
+ if (in_initrd())
+ l = parse_fstab("/sysroot", true);
- return (r < 0) || (k < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+ return (r < 0) || (k < 0) || (l < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
}
View Lorry Controller Status