X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=7b3bf11eda1ff3319bc00b04331f1a33dfc8c88e;hp=07467249831c6971be722ac769fa10af3332d0d7;hb=1d634e21b453f3c80d7c6c4bd90a6b84e42a3d2a;hpb=2b71016a3c3d4c088e8edd170fe6eb8431fd71fa diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 074672498..7b3bf11ed 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -32,8 +32,10 @@ #include "mount-setup.h" #include "special.h" #include "mkdir.h" +#include "virt.h" static const char *arg_dest = "/tmp"; +static bool arg_enabled = true; static int device_name(const char *path, char **unit) { char *p; @@ -45,7 +47,7 @@ static int device_name(const char *path, char **unit) { p = unit_name_from_path(path, ".device"); if (!p) - return -ENOMEM; + return log_oom(); *unit = p; return 1; @@ -96,22 +98,20 @@ static int add_swap(const char *what, struct mntent *me) { name = unit_name_from_path(what, ".swap"); if (!name) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } - unit = join(arg_dest, "/", name, NULL); + unit = strjoin(arg_dest, "/", name, NULL); if (!unit) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } f = fopen(unit, "wxe"); if (!f) { r = -errno; - log_error("Failed to create unit file: %m"); + log_error("Failed to create unit file %s: %m", unit); goto finish; } @@ -138,45 +138,40 @@ static int add_swap(const char *what, struct mntent *me) { fflush(f); if (ferror(f)) { - log_error("Failed to write unit file: %m"); + log_error("Failed to write unit file %s: %m", unit); r = -errno; goto finish; } if (!noauto) { - lnk = join(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL); + lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL); if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); + log_error("Failed to create symlink %s: %m", lnk); r = -errno; goto finish; } r = device_name(what, &device); - if (r < 0) { - log_error("Out of memory"); - r = -ENOMEM; + if (r < 0) goto finish; - } if (r > 0) { free(lnk); - lnk = join(arg_dest, "/", device, ".wants/", name, NULL); + lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); + log_error("Failed to create symlink %s: %m", lnk); r = -errno; goto finish; } @@ -196,14 +191,6 @@ finish: return r; } -static bool mount_is_bind(struct mntent *me) { - assert(me); - - return - hasmntopt(me, "bind") || - streq(me->mnt_opts, "bind"); -} - static bool mount_is_network(struct mntent *me) { assert(me); @@ -236,7 +223,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { return 0; isnetwork = mount_is_network(me); - isbind = mount_is_bind(me); + isbind = !!hasmntopt(me, "bind"); noauto = !!hasmntopt(me, "noauto"); nofail = !!hasmntopt(me, "nofail"); @@ -253,23 +240,21 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { } name = unit_name_from_path(where, ".mount"); - if (!name) { - log_error("Out of memory"); - r = -ENOMEM; + if (!name) { + r = log_oom(); goto finish; } - unit = join(arg_dest, "/", name, NULL); + unit = strjoin(arg_dest, "/", name, NULL); if (!unit) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } f = fopen(unit, "wxe"); if (!f) { r = -errno; - log_error("Failed to create unit file: %m"); + log_error("Failed to create unit file %s: %m", unit); goto finish; } @@ -313,22 +298,21 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { fflush(f); if (ferror(f)) { - log_error("Failed to write unit file: %m"); + log_error("Failed to write unit file %s: %m", unit); r = -errno; goto finish; } if (!noauto) { - lnk = join(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); + lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); + log_error("Failed to create symlink %s: %m", lnk); r = -errno; goto finish; } @@ -337,24 +321,20 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { !path_equal(where, "/")) { r = device_name(what, &device); - if (r < 0) { - log_error("Out of memory"); - r = -ENOMEM; + if (r < 0) goto finish; - } if (r > 0) { free(lnk); - lnk = join(arg_dest, "/", device, ".wants/", name, NULL); + lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to creat symlink: %m"); + log_error("Failed to create symlink %s: %m", lnk); r = -errno; goto finish; } @@ -365,15 +345,13 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { if (automount && !path_equal(where, "/")) { automount_name = unit_name_from_path(where, ".automount"); if (!name) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } - automount_unit = join(arg_dest, "/", automount_name, NULL); + automount_unit = strjoin(arg_dest, "/", automount_name, NULL); if (!automount_unit) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -381,7 +359,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { f = fopen(automount_unit, "wxe"); if (!f) { r = -errno; - log_error("Failed to create unit file: %m"); + log_error("Failed to create unit file %s: %m", automount_unit); goto finish; } @@ -400,22 +378,21 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { fflush(f); if (ferror(f)) { - log_error("Failed to write unit file: %m"); + log_error("Failed to write unit file %s: %m", automount_unit); r = -errno; goto finish; } free(lnk); - lnk = join(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL); + lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL); if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } mkdir_parents_label(lnk, 0755); if (symlink(automount_unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); + log_error("Failed to create symlink %s: %m", lnk); r = -errno; goto finish; } @@ -457,23 +434,18 @@ static int parse_fstab(void) { what = fstab_node_to_udev_node(me->mnt_fsname); if (!what) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } where = strdup(me->mnt_dir); if (!where) { - log_error("Out of memory"); + r = log_oom(); free(what); - r = -ENOMEM; goto finish; } - if (path_is_absolute(what)) - path_kill_slashes(what); - - if (path_is_absolute(where)) + if (is_path(where)) path_kill_slashes(where); log_debug("Found entry what=%s where=%s type=%s", what, where, me->mnt_type); @@ -495,6 +467,62 @@ finish: return r; } +static int parse_proc_cmdline(void) { + char *line, *w, *state; + int r; + size_t l; + + if (detect_container(NULL) > 0) + return 0; + + r = read_one_line_file("/proc/cmdline", &line); + if (r < 0) { + log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); + return 0; + } + + FOREACH_WORD_QUOTED(w, l, line, state) { + char *word; + + word = strndup(w, l); + if (!word) { + r = log_oom(); + goto finish; + } + + if (startswith(word, "fstab=")) { + r = parse_boolean(word + 6); + if (r < 0) + log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6); + else + arg_enabled = r; + + } else if (startswith(word, "rd.fstab=")) { + + if (in_initrd()) { + r = parse_boolean(word + 6); + if (r < 0) + log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6); + else + arg_enabled = r; + } + + } else if (startswith(word, "fstab.") || + (in_initrd() && startswith(word, "rd.fstab."))) { + + log_warning("Unknown kernel switch %s. Ignoring.", word); + } + + free(word); + } + + r = 0; + +finish: + free(line); + return r; +} + int main(int argc, char *argv[]) { int r; @@ -512,6 +540,12 @@ int main(int argc, char *argv[]) { umask(0022); + if (parse_proc_cmdline() < 0) + return EXIT_FAILURE; + + if (!arg_enabled) + return EXIT_SUCCESS; + r = parse_fstab(); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;