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: read rd.fstab=on/off switch correctly
[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 b4fb1344e6b200e5e6cd5dbd956ac00b72583944..5a2074ec7f0496cb0903110d2ee9585463ca5987 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;
@@
-199,13
+199,25
@@
static bool mount_in_initrd(struct mntent *me) {
streq(me->mnt_dir, "/usr");
}
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 *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,
+ 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;
*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;
assert(what);
int r;
assert(what);
@@
-252,11
+264,22
@@
static int add_mount(const char *what, const char *where, const char *type, cons
if (!path_equal(where, "/")) {
if (pre)
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",
fprintf(f,
"After=%s\n"
"Wants=%s\n",
- pre,
- pre);
+ online,
+ online);
+
fprintf(f,
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET "\n");
fprintf(f,
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET "\n");
@@
-383,31
+406,33
@@
static int add_mount(const char *what, const char *where, const char *type, cons
}
static int parse_fstab(const char *prefix, bool initrd) {
}
static int parse_fstab(const char *prefix, bool initrd) {
- FILE *f;
_cleanup_free_ char *fstab_path = NULL;
_cleanup_free_ char *fstab_path = NULL;
+ FILE *f;
int r = 0;
struct mntent *me;
int r = 0;
struct mntent *me;
- errno = 0;
- fstab_path = strjoin(prefix, "/etc/fstab", NULL);
+ 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;
f = setmntent(fstab_path, "r");
if (!f) {
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))) {
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);
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 (!what || !where) {
r = log_oom();
goto finish;
@@
-422,7
+447,7
@@
static int parse_fstab(const char *prefix, bool initrd) {
k = add_swap(what, me);
else {
bool noauto, nofail, automount, isbind;
k = add_swap(what, me);
else {
bool noauto, nofail, automount, isbind;
- const char *pre, *p
ost
;
+ const char *pre, *p
re2, *post, *online
;
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");
@@
-432,19
+457,25
@@
static int parse_fstab(const char *prefix, bool initrd) {
isbind = mount_is_bind(me);
if (initrd) {
isbind = mount_is_bind(me);
if (initrd) {
+ pre = pre2 = online = NULL;
post = SPECIAL_INITRD_FS_TARGET;
post = SPECIAL_INITRD_FS_TARGET;
- pre = NULL;
+ } else if (mount_in_initrd(me)) {
+ pre = pre2 = online = NULL;
+ post = SPECIAL_INITRD_ROOT_FS_TARGET;
} else if (mount_is_network(me)) {
} else if (mount_is_network(me)) {
- post = SPECIAL_REMOTE_FS_TARGET;
pre = SPECIAL_REMOTE_FS_PRE_TARGET;
pre = SPECIAL_REMOTE_FS_PRE_TARGET;
+ pre2 = SPECIAL_NETWORK_TARGET;
+ online = SPECIAL_NETWORK_ONLINE_TARGET;
+ post = SPECIAL_REMOTE_FS_TARGET;
} else {
} else {
- post = SPECIAL_LOCAL_FS_TARGET;
pre = SPECIAL_LOCAL_FS_PRE_TARGET;
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,
}
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, noauto, nofail, automount,
-
isbind, pr
e, post, fstab_path);
+
me->mnt_passno, noauto, nofail, automount,
+
isbind, pre, pre2, onlin
e, post, fstab_path);
}
if (k < 0)
}
if (k < 0)
@@
-457,10
+488,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) {
@@
-476,7
+508,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)
@@
-495,26
+527,32
@@
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);
}
}
+ noauto = !!strstr(opts, "noauto");
+ nofail = !!strstr(opts, "nofail");
+
if (!what) {
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;
}
return 0;
}
@@
-524,14
+562,14
@@
static int parse_new_root_from_proc_cmdline(void) {
}
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
}
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
_ROOT_FS_TARGET, "/proc/cmdline");
+ r = add_mount(what, "/sysroot", type, opts, 0,
noauto, nofail
, false,
+ false, NULL,
NULL, NULL, SPECIAL_INITRD
_ROOT_FS_TARGET, "/proc/cmdline");
return (r < 0) ? r : 0;
}
static int parse_proc_cmdline(void) {
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;
char *w, *state;
int r;
size_t l;
@@
-546,7
+584,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)
@@
-562,9
+600,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;
}
@@
-605,7
+643,7
@@
int main(int argc, char *argv[]) {
if (!arg_enabled)
return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
if (!arg_enabled)
return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
- k = parse_fstab(
""
, false);
+ k = parse_fstab(
NULL
, false);
if (in_initrd())
l = parse_fstab("/sysroot", true);
if (in_initrd())
l = parse_fstab("/sysroot", true);