#include "mount-setup.h"
#include "special.h"
#include "mkdir.h"
-#include "virt.h"
+#include "fileio.h"
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
-static int device_name(const char *path, char **unit) {
- char *p;
-
- assert(path);
-
- if (!is_device_path(path))
- return 0;
-
- p = unit_name_from_path(path, ".device");
- if (!p)
- return -ENOMEM;
-
- *unit = p;
- return 1;
-}
-
static int mount_find_pri(struct mntent *me, int *ret) {
char *end, *pri;
unsigned long r;
errno = 0;
r = strtoul(pri, &end, 10);
- if (errno != 0)
+ if (errno > 0)
return -errno;
if (end == pri || (*end != ',' && *end != 0))
}
static int add_swap(const char *what, struct mntent *me) {
- char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
- FILE *f = NULL;
- bool noauto, nofail;
+ _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ bool noauto;
int r, pri = -1;
assert(what);
}
noauto = !!hasmntopt(me, "noauto");
- nofail = !!hasmntopt(me, "nofail");
name = unit_name_from_path(what, ".swap");
- if (!name) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!name)
+ return log_oom();
unit = strjoin(arg_dest, "/", name, NULL);
- if (!unit) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!unit)
+ return log_oom();
f = fopen(unit, "wxe");
if (!f) {
- r = -errno;
- log_error("Failed to create unit file: %m");
- goto finish;
+ if (errno == EEXIST)
+ log_error("Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
+ else
+ log_error("Failed to create unit file %s: %m", unit);
+ return -errno;
}
- fputs("# Automatically generated by systemd-fstab-generator\n\n"
- "[Unit]\n"
- "SourcePath=/etc/fstab\n"
- "DefaultDependencies=no\n"
- "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET "\n", f);
-
- if (!noauto && !nofail)
- fputs("Before=" SPECIAL_SWAP_TARGET "\n", f);
-
fprintf(f,
- "\n"
+ "# Automatically generated by systemd-fstab-generator\n\n"
+ "[Unit]\n"
+ "SourcePath=/etc/fstab\n\n"
"[Swap]\n"
"What=%s\n",
what);
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
- r = -errno;
- goto finish;
+ log_error("Failed to write unit file %s: %m", unit);
+ return -errno;
}
if (!noauto) {
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
- if (!lnk) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!lnk)
+ return log_oom();
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
- r = -errno;
- goto finish;
- }
-
- r = device_name(what, &device);
- if (r < 0) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
-
- if (r > 0) {
- free(lnk);
- lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
- if (!lnk) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
-
- mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
- r = -errno;
- goto finish;
- }
+ log_error("Failed to create symlink %s: %m", lnk);
+ return -errno;
}
}
- r = 0;
-finish:
- if (f)
- fclose(f);
-
- free(unit);
- free(lnk);
- free(name);
- free(device);
-
- return r;
+ return 0;
}
-static bool mount_is_bind(struct mntent *me) {
+static bool mount_is_network(struct mntent *me) {
assert(me);
return
- hasmntopt(me, "bind") ||
- streq(me->mnt_opts, "bind");
+ hasmntopt(me, "_netdev") ||
+ fstype_is_network(me->mnt_type);
}
-static bool mount_is_network(struct mntent *me) {
+static bool mount_in_initrd(struct mntent *me) {
assert(me);
return
- hasmntopt(me, "_netdev") ||
- fstype_is_network(me->mnt_type);
+ hasmntopt(me, "x-initrd.mount") ||
+ streq(me->mnt_dir, "/usr");
}
-static int add_mount(const char *what, const char *where, struct mntent *me) {
- char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL, *automount_name = NULL, *automount_unit = NULL;
- FILE *f = NULL;
- bool noauto, nofail, automount, isbind, isnetwork;
+static int add_fsck(FILE *f, const char *what, const char *where, const char *type, int passno) {
+ assert(f);
+
+ if (passno == 0)
+ return 0;
+
+ if (!is_device_path(what)) {
+ log_warning("Checking was requested for \"%s\", but it is not a device.", what);
+ return 0;
+ }
+
+ if (type && !streq(type, "auto")) {
+ int r;
+ const char *checker;
+
+ checker = strappenda("/sbin/fsck.", type);
+ r = access(checker, X_OK);
+ if (r < 0) {
+ log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
+
+ /* treat missing check as essentially OK */
+ return errno == ENOENT ? 0 : -errno;
+ }
+ }
+
+ if (streq(where, "/")) {
+ char *lnk;
+
+ lnk = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service");
+ mkdir_parents_label(lnk, 0755);
+ if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0) {
+ log_error("Failed to create symlink %s: %m", lnk);
+ return -errno;
+ }
+ } else {
+ _cleanup_free_ char *fsck = NULL;
+
+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
+ if (!fsck)
+ return log_oom();
+
+ fprintf(f,
+ "RequiresOverridable=%s\n"
+ "After=%s\n",
+ fsck,
+ fsck);
+ }
+
+ return 0;
+}
+
+static int add_mount(
+ const char *what,
+ const char *where,
+ const char *type,
+ const char *opts,
+ int passno,
+ bool noauto,
+ bool nofail,
+ bool automount,
+ const char *post,
+ const char *source) {
+ _cleanup_free_ char
+ *name = NULL, *unit = NULL, *lnk = NULL,
+ *automount_name = NULL, *automount_unit = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
int r;
- const char *post, *pre;
assert(what);
assert(where);
- assert(me);
+ assert(type);
+ assert(opts);
+ assert(source);
- if (streq(me->mnt_type, "autofs"))
+ if (streq(type, "autofs"))
return 0;
if (!is_path(where)) {
mount_point_ignore(where))
return 0;
- isnetwork = mount_is_network(me);
- isbind = mount_is_bind(me);
-
- noauto = !!hasmntopt(me, "noauto");
- nofail = !!hasmntopt(me, "nofail");
- automount =
- hasmntopt(me, "comment=systemd.automount") ||
- hasmntopt(me, "x-systemd.automount");
-
- 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) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!name)
+ return log_oom();
unit = strjoin(arg_dest, "/", name, NULL);
- if (!unit) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!unit)
+ return log_oom();
f = fopen(unit, "wxe");
if (!f) {
- r = -errno;
- log_error("Failed to create unit file: %m");
- goto finish;
+ if (errno == EEXIST)
+ log_error("Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
+ else
+ log_error("Failed to create unit file %s: %m", unit);
+ return -errno;
}
- fputs("# Automatically generated by systemd-fstab-generator\n\n"
+ fprintf(f,
+ "# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=/etc/fstab\n"
- "DefaultDependencies=no\n", f);
+ "SourcePath=%s\n",
+ source);
- if (!path_equal(where, "/"))
- fprintf(f,
- "After=%s\n"
- "Wants=%s\n"
- "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET "\n",
- pre,
- pre);
-
-
- if (!noauto && !nofail && !automount)
+ if (post && !noauto && !nofail && !automount)
fprintf(f,
"Before=%s\n",
post);
+ r = add_fsck(f, what, where, type, passno);
+ if (r < 0)
+ return r;
+
fprintf(f,
"\n"
"[Mount]\n"
"What=%s\n"
"Where=%s\n"
- "Type=%s\n"
- "FsckPassNo=%i\n",
+ "Type=%s\n",
what,
where,
- me->mnt_type,
- me->mnt_passno);
+ type);
- if (!isempty(me->mnt_opts) &&
- !streq(me->mnt_opts, "defaults"))
+ if (!isempty(opts) &&
+ !streq(opts, "defaults"))
fprintf(f,
"Options=%s\n",
- me->mnt_opts);
+ opts);
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
- r = -errno;
- goto finish;
+ log_error("Failed to write unit file %s: %m", unit);
+ return -errno;
}
if (!noauto) {
- lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
- if (!lnk) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
-
- mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
- r = -errno;
- goto finish;
- }
+ if (post) {
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ if (!lnk)
+ return log_oom();
- if (!isbind &&
- !path_equal(where, "/")) {
-
- r = device_name(what, &device);
- if (r < 0) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
-
- if (r > 0) {
- free(lnk);
- lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
- if (!lnk) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
-
- mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to creat symlink: %m");
- r = -errno;
- goto finish;
- }
+ mkdir_parents_label(lnk, 0755);
+ if (symlink(unit, lnk) < 0) {
+ log_error("Failed to create symlink %s: %m", lnk);
+ return -errno;
}
}
}
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
- if (!name) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!automount_name)
+ return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
- if (!automount_unit) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!automount_unit)
+ return log_oom();
fclose(f);
f = fopen(automount_unit, "wxe");
if (!f) {
- r = -errno;
- log_error("Failed to create unit file: %m");
- goto finish;
+ log_error("Failed to create unit file %s: %m", automount_unit);
+ return -errno;
}
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=/etc/fstab\n"
- "DefaultDependencies=no\n"
- "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET " %s\n"
- "\n"
+ "SourcePath=%s\n",
+ source);
+
+ if (post)
+ fprintf(f,
+ "Before= %s\n",
+ post);
+
+ fprintf(f,
"[Automount]\n"
"Where=%s\n",
- post,
where);
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
- r = -errno;
- goto finish;
+ log_error("Failed to write unit file %s: %m", automount_unit);
+ return -errno;
}
free(lnk);
lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
- if (!lnk) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (!lnk)
+ return log_oom();
mkdir_parents_label(lnk, 0755);
if (symlink(automount_unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
- r = -errno;
- goto finish;
+ log_error("Failed to create symlink %s: %m", lnk);
+ return -errno;
}
}
- r = 0;
-finish:
- if (f)
- fclose(f);
-
- free(unit);
- free(lnk);
- free(name);
- free(device);
- free(automount_name);
- free(automount_unit);
-
- return r;
+ return 0;
}
-static int parse_fstab(void) {
- FILE *f;
+static int parse_fstab(const char *prefix, bool initrd) {
+ char *fstab_path;
+ _cleanup_endmntent_ FILE *f;
int r = 0;
struct mntent *me;
- errno = 0;
- f = setmntent("/etc/fstab", "r");
+ fstab_path = strappenda(strempty(prefix), "/etc/fstab");
+ 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 *where, *what;
+ _cleanup_free_ char *where = NULL, *what = NULL;
int k;
- what = fstab_node_to_udev_node(me->mnt_fsname);
- if (!what) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ if (initrd && !mount_in_initrd(me))
+ continue;
- where = strdup(me->mnt_dir);
- if (!where) {
- log_error("Out of memory.");
- free(what);
- r = -ENOMEM;
- goto finish;
- }
+ what = fstab_node_to_udev_node(me->mnt_fsname);
+ where = strjoin(strempty(prefix), me->mnt_dir, NULL);
+ if (!what || !where)
+ return log_oom();
if (is_path(where))
path_kill_slashes(where);
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
- else
- k = add_mount(what, where, me);
+ else {
+ bool noauto, nofail, automount;
+ const char *post;
+
+ noauto = !!hasmntopt(me, "noauto");
+ nofail = !!hasmntopt(me, "nofail");
+ automount =
+ hasmntopt(me, "comment=systemd.automount") ||
+ hasmntopt(me, "x-systemd.automount");
+
+ if (initrd) {
+ post = SPECIAL_INITRD_FS_TARGET;
+ } else if (mount_in_initrd(me)) {
+ post = SPECIAL_INITRD_ROOT_FS_TARGET;
+ } else if (mount_is_network(me)) {
+ post = SPECIAL_REMOTE_FS_TARGET;
+ } else {
+ post = SPECIAL_LOCAL_FS_TARGET;
+ }
- free(what);
- free(where);
+ k = add_mount(what, where, me->mnt_type, me->mnt_opts,
+ me->mnt_passno, noauto, nofail, automount,
+ post, fstab_path);
+ }
if (k < 0)
r = k;
}
-finish:
- endmntent(f);
return r;
}
-static int parse_proc_cmdline(void) {
- char *line, *w, *state;
- int r;
+static int parse_new_root_from_proc_cmdline(void) {
+ _cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
+ bool noauto, nofail;
+ char *w, *state;
size_t l;
+ int r;
- if (detect_container(NULL) > 0)
- return 0;
-
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
+ r = proc_cmdline(&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return 0;
- }
+ 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 */
FOREACH_WORD_QUOTED(w, l, line, state) {
- char *word;
+ _cleanup_free_ char *word;
word = strndup(w, l);
- if (!word) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!word)
+ return log_oom();
- 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, "root=")) {
+ free(what);
+ what = fstab_node_to_udev_node(word+5);
+ if (!what)
+ return log_oom();
- } else if (startswith(word, "rd.fstab=")) {
+ } else if (startswith(word, "rootfstype=")) {
+ free(type);
+ type = strdup(word + 11);
+ if (!type)
+ return log_oom();
- 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, "rootflags=")) {
+ char *o;
+
+ o = strjoin(opts, ",", word + 10, NULL);
+ if (!o)
+ return log_oom();
- } else if (startswith(word, "fstab.") ||
- (in_initrd() && startswith(word, "rd.fstab."))) {
+ free(opts);
+ opts = o;
- log_warning("Unknown kernel switch %s. Ignoring.", word);
+ } else if (streq(word, "ro") || streq(word, "rw")) {
+ char *o;
+
+ o = strjoin(opts, ",", word, NULL);
+ if (!o)
+ return log_oom();
+
+ free(opts);
+ opts = o;
}
+ }
- free(word);
+ noauto = !!strstr(opts, "noauto");
+ nofail = !!strstr(opts, "nofail");
+
+ if (!what) {
+ log_debug("Could not find a root= entry on the kernel commandline.");
+ return 0;
}
- r = 0;
+ if (what[0] != '/') {
+ log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type);
+ return 0;
+ }
-finish:
- free(line);
- return r;
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+ r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false,
+ SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+
+ return (r < 0) ? r : 0;
}
-int main(int argc, char *argv[]) {
+static int parse_proc_cmdline_word(const char *word) {
int r;
+ 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 + 9);
+ if (r < 0)
+ log_warning("Failed to parse fstab switch %s. Ignoring.", word + 9);
+ else
+ arg_enabled = r;
+ }
+
+ } else if (startswith(word, "fstab.") ||
+ (in_initrd() && startswith(word, "rd.fstab."))) {
+
+ log_warning("Unknown kernel switch %s. Ignoring.", word);
+ }
+
+ return 0;
+}
+
+int main(int argc, char *argv[]) {
+ int r = 0, k, l = 0;
+
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
return EXIT_FAILURE;
umask(0022);
- if (parse_proc_cmdline() < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
return EXIT_FAILURE;
+ if (in_initrd())
+ 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 ? EXIT_FAILURE : EXIT_SUCCESS;
+ return (r < 0) || (k < 0) || (l < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
}
~ianmdlvl / elogind.git / blobdiff