chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fstab-generator: use DefaultDependencies=yes
[elogind.git]
/
src
/
fstab-generator
/
fstab-generator.c
diff --git
a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
index 23a8d7981314926e2d657ea164fbbf2ee6feab21..6f352d113f20048970f984d3104a33f2e55eb679 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-69,7
+69,7
@@
static int mount_find_pri(struct mntent *me, int *ret) {
errno = 0;
r = strtoul(pri, &end, 10);
errno = 0;
r = strtoul(pri, &end, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (end == pri || (*end != ',' && *end != 0))
return -errno;
if (end == pri || (*end != ',' && *end != 0))
@@
-80,8
+80,8
@@
static int mount_find_pri(struct mntent *me, int *ret) {
}
static int add_swap(const char *what, struct mntent *me) {
}
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;
bool noauto, nofail;
int r, pri = -1;
@@
-116,10
+116,7
@@
static int add_swap(const char *what, struct mntent *me) {
fputs("# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
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);
if (!noauto && !nofail)
fputs("Before=" SPECIAL_SWAP_TARGET "\n", f);
@@
-191,15
+188,31
@@
static bool mount_is_network(struct mntent *me) {
fstype_is_network(me->mnt_type);
}
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 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 *post,
+ const char *source) {
+ _cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
*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;
int r;
- const char *post, *pre;
assert(what);
assert(where);
assert(what);
assert(where);
@@
-219,14
+232,6
@@
static int add_mount(const char *what, const char *where, const char *type, cons
mount_point_ignore(where))
return 0;
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();
name = unit_name_from_path(where, ".mount");
if (!name)
return log_oom();
@@
-247,21
+252,10
@@
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"
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=%s\n"
- "DefaultDependencies=no\n",
+ "SourcePath=%s\n",
source);
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);
fprintf(f,
"Before=%s\n",
post);
@@
-291,14
+285,16
@@
static int add_mount(const char *what, const char *where, const char *type, cons
}
if (!noauto) {
}
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 &&
}
if (!isbind &&
@@
-325,7
+321,7
@@
static int add_mount(const char *what, const char *where, const char *type, cons
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
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);
return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
@@
-342,14
+338,17
@@
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"
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",
"[Automount]\n"
"Where=%s\n",
- post,
where);
fflush(f);
where);
fflush(f);
@@
-373,27
+372,34
@@
static int add_mount(const char *what, const char *where, const char *type, cons
return 0;
}
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;
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;
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))) {
return -errno;
}
while ((me = getmntent(f))) {
-
char _cleanup_free_
*where = NULL, *what = NULL;
+
_cleanup_free_ char
*where = NULL, *what = NULL;
int k;
int k;
+ if (initrd && !mount_in_initrd(me))
+ continue;
+
what = fstab_node_to_udev_node(me->mnt_fsname);
what = fstab_node_to_udev_node(me->mnt_fsname);
- where = str
dup(me->mnt_dir
);
+ where = str
join(strempty(prefix), me->mnt_dir, NULL
);
if (!what || !where) {
r = log_oom();
goto finish;
if (!what || !where) {
r = log_oom();
goto finish;
@@
-407,7
+413,8
@@
static int parse_fstab(void) {
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
else {
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 *post;
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");
@@
-415,11
+422,20
@@
static int parse_fstab(void) {
hasmntopt(me, "comment=systemd.automount") ||
hasmntopt(me, "x-systemd.automount");
isbind = mount_is_bind(me);
hasmntopt(me, "comment=systemd.automount") ||
hasmntopt(me, "x-systemd.automount");
isbind = mount_is_bind(me);
- isnetwork = mount_is_network(me);
+
+ 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;
+ }
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, noauto, nofail, automount,
-
isbind, isnetwork, "/etc/fstab"
);
+
me->mnt_passno, noauto, nofail, automount,
+
isbind, post, fstab_path
);
}
if (k < 0)
}
if (k < 0)
@@
-432,10
+448,11
@@
finish:
}
static int parse_new_root_from_proc_cmdline(void) {
}
static int parse_new_root_from_proc_cmdline(void) {
- char *w, *state;
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
+ char *w, *state;
int r;
size_t l;
int r;
size_t l;
+ bool noauto, nofail;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@@
-451,7
+468,7
@@
static int parse_new_root_from_proc_cmdline(void) {
/* 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) {
/* 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)
word = strndup(w, l);
if (!word)
@@
-470,40
+487,49
@@
static int parse_new_root_from_proc_cmdline(void) {
return log_oom();
} else if (startswith(word, "rootflags=")) {
return log_oom();
} else if (startswith(word, "rootflags=")) {
-
tmp_word = opts
;
- opts = strjoin(opts, ",", word + 10, NULL);
-
free(tmp_word
);
- if (!o
pts
)
+
char *o
;
+
+
o = strjoin(opts, ",", word + 10, NULL
);
+ if (!o)
return log_oom();
return log_oom();
+ free(opts);
+ opts = o;
+
} else if (streq(word, "ro") || streq(word, "rw")) {
} else if (streq(word, "ro") || streq(word, "rw")) {
-
tmp_word = opts
;
- opts = strjoin(opts, ",", word, NULL);
-
free(tmp_word
);
- if (!o
pts
)
+
char *o
;
+
+
o = strjoin(opts, ",", word, NULL
);
+ if (!o)
return log_oom();
return log_oom();
+ free(opts);
+ opts = o;
}
}
-
- free(word);
}
}
- if (what) {
+ noauto = !!strstr(opts, "noauto");
+ nofail = !!strstr(opts, "nofail");
- log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
- r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
- false, false, "/proc/cmdline");
+ if (!what) {
+ log_debug("Could not find a root= entry on the kernel commandline.");
+ return 0;
+ }
- if (r < 0)
-
return r
;
- } else
- log_error("Could not find a root= entry on the kernel commandline.");
+ if (what[0] != '/') {
+
log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type)
;
+ return 0;
+ }
- return 0;
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+ r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
+ false, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+
+ return (r < 0) ? r : 0;
}
static int parse_proc_cmdline(void) {
}
static int parse_proc_cmdline(void) {
-
char _cleanup_free_
*line = NULL;
+
_cleanup_free_ char
*line = NULL;
char *w, *state;
int r;
size_t l;
char *w, *state;
int r;
size_t l;
@@
-518,7
+544,7
@@
static int parse_proc_cmdline(void) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
-
char _cleanup_free_
*word = NULL;
+
_cleanup_free_ char
*word = NULL;
word = strndup(w, l);
if (!word)
word = strndup(w, l);
if (!word)
@@
-534,9
+560,9
@@
static int parse_proc_cmdline(void) {
} else if (startswith(word, "rd.fstab=")) {
if (in_initrd()) {
} else if (startswith(word, "rd.fstab=")) {
if (in_initrd()) {
- r = parse_boolean(word +
6
);
+ r = parse_boolean(word +
9
);
if (r < 0)
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;
}
else
arg_enabled = r;
}
@@
-552,7
+578,7
@@
static int parse_proc_cmdline(void) {
}
int main(int argc, char *argv[]) {
}
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.");
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
@@
-572,12
+598,15
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
if (in_initrd())
return EXIT_FAILURE;
if (in_initrd())
-
k
= parse_new_root_from_proc_cmdline();
+
r
= parse_new_root_from_proc_cmdline();
if (!arg_enabled)
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;
}
}