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 _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;
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);
+ "SourcePath=/etc/fstab\n", f);
if (!noauto && !nofail)
fputs("Before=" SPECIAL_SWAP_TARGET "\n", f);
return 0;
}
-static bool mount_is_bind(struct mntent *me) {
- assert(me);
-
- return
- hasmntopt(me, "bind") ||
- streq(me->mnt_type, "bind") ||
- hasmntopt(me, "rbind") ||
- streq(me->mnt_type, "rbind");
-}
-
static bool mount_is_network(struct mntent *me) {
assert(me);
streq(me->mnt_dir, "/usr");
}
-static bool mount_is_rootfs(struct mntent *me) {
- assert(me);
-
- return hasmntopt(me, "x-initrd.rootfs");
-}
-
-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 *post, const char *source) {
- char _cleanup_free_
+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, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
- FILE _cleanup_fclose_ *f = NULL;
- int r;
+ _cleanup_fclose_ FILE *f = NULL;
assert(what);
assert(where);
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=%s\n"
- "DefaultDependencies=no\n",
+ "SourcePath=%s\n",
source);
- if (!path_equal(where, "/")) {
- if (pre)
- fprintf(f,
- "After=%s\n"
- "Wants=%s\n",
- pre,
- pre);
- fprintf(f,
- "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET "\n");
- }
-
if (post && !noauto && !nofail && !automount)
fprintf(f,
"Before=%s\n",
return -errno;
}
}
-
- if (!isbind &&
- !path_equal(where, "/")) {
-
- r = device_name(what, &device);
- if (r < 0)
- return r;
-
- if (r > 0) {
- free(lnk);
- lnk = strjoin(arg_dest, "/", device, ".wants/", 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;
- }
- }
- }
}
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
- if (!name)
+ if (!automount_name)
return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=%s\n"
- "DefaultDependencies=no\n"
- "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
- "Before=" SPECIAL_UMOUNT_TARGET "\n",
+ "SourcePath=%s\n",
source);
if (post)
if (errno == ENOENT)
return 0;
- log_error("Failed to open %s/etc/fstab: %m", prefix);
+ 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 = strjoin(prefix, me->mnt_dir, NULL);
+ where = strjoin(strempty(prefix), me->mnt_dir, NULL);
if (!what || !where) {
r = log_oom();
goto finish;
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
else {
- bool noauto, nofail, automount, isbind;
- const char *pre, *post;
+ 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");
- isbind = mount_is_bind(me);
if (initrd) {
post = SPECIAL_INITRD_FS_TARGET;
- pre = NULL;
- } else if (mount_is_rootfs(me)) {
+ } else if (mount_in_initrd(me)) {
post = SPECIAL_INITRD_ROOT_FS_TARGET;
- pre = NULL;
} else if (mount_is_network(me)) {
post = SPECIAL_REMOTE_FS_TARGET;
- pre = SPECIAL_REMOTE_FS_PRE_TARGET;
} else {
post = SPECIAL_LOCAL_FS_TARGET;
- pre = SPECIAL_LOCAL_FS_PRE_TARGET;
}
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, noauto, nofail, automount,
- isbind, pre, post, fstab_path);
+ me->mnt_passno, noauto, nofail, automount,
+ post, fstab_path);
}
if (k < 0)
char *w, *state;
int r;
size_t l;
+ bool noauto, nofail;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
}
}
+ noauto = !!strstr(opts, "noauto");
+ nofail = !!strstr(opts, "nofail");
+
if (!what) {
- log_error("Could not find a root= entry on the kernel commandline.");
+ log_debug("Could not find a root= entry on the kernel commandline.");
return 0;
}
}
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, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+ r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
+ SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
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;
}
FOREACH_WORD_QUOTED(w, l, line, state) {
- char _cleanup_free_ *word = NULL;
+ _cleanup_free_ char *word = NULL;
word = strndup(w, l);
if (!word)
} else if (startswith(word, "rd.fstab=")) {
if (in_initrd()) {
- r = parse_boolean(word + 6);
+ r = parse_boolean(word + 9);
if (r < 0)
- log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
+ log_warning("Failed to parse fstab switch %s. Ignoring.", word + 9);
else
arg_enabled = r;
}
~ianmdlvl / elogind.git / blobdiff