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: place initrd /sysroot mounts in initrd-fs.target
[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 af7276daa7c82212bfedab875b8924641f122542..a8436e6233f1c54cf190c54456427089deb00903 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-191,9
+191,17
@@
static bool mount_is_network(struct mntent *me) {
fstype_is_network(me->mnt_type);
}
fstype_is_network(me->mnt_type);
}
+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,
static int add_mount(const char *what, const char *where, const char *type, const char *opts,
- int passno, bool
wait, bool noauto, bool nofail, bool automount, bool isbind, bool isnetwork
,
- const char *source) {
+ int passno, bool
noauto, bool nofail, bool automount, bool isbind
,
+
bool remote_fs_target, bool initrd_fs_target,
const char *source) {
char _cleanup_free_
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
char _cleanup_free_
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
@@
-219,9
+227,12
@@
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
) {
+ if (
remote_fs_target
) {
post = SPECIAL_REMOTE_FS_TARGET;
pre = SPECIAL_REMOTE_FS_PRE_TARGET;
post = SPECIAL_REMOTE_FS_TARGET;
pre = SPECIAL_REMOTE_FS_PRE_TARGET;
+ } else if (initrd_fs_target) {
+ post = SPECIAL_INITRD_FS_TARGET;
+ pre = SPECIAL_INITRD_FS_PRE_TARGET;
} else {
post = SPECIAL_LOCAL_FS_TARGET;
pre = SPECIAL_LOCAL_FS_PRE_TARGET;
} else {
post = SPECIAL_LOCAL_FS_TARGET;
pre = SPECIAL_LOCAL_FS_PRE_TARGET;
@@
-284,10
+295,6
@@
static int add_mount(const char *what, const char *where, const char *type, cons
"Options=%s\n",
opts);
"Options=%s\n",
opts);
- if (wait)
- fprintf(f,
- "TimeoutSec=0\n");
-
fflush(f);
if (ferror(f)) {
log_error("Failed to write unit file %s: %m", unit);
fflush(f);
if (ferror(f)) {
log_error("Failed to write unit file %s: %m", unit);
@@
-346,13
+353,14
@@
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"
+ "SourcePath=
%s
\n"
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " %s\n"
"\n"
"[Automount]\n"
"Where=%s\n",
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " %s\n"
"\n"
"[Automount]\n"
"Where=%s\n",
+ source,
post,
where);
post,
where);
@@
-377,18
+385,20
@@
static int add_mount(const char *what, const char *where, const char *type, cons
return 0;
}
return 0;
}
-static int parse_fstab(
voi
d) {
+static int parse_fstab(
const char *prefix, bool initr
d) {
FILE *f;
FILE *f;
+ _cleanup_free_ char *fstab_path = NULL;
int r = 0;
struct mntent *me;
errno = 0;
int r = 0;
struct mntent *me;
errno = 0;
- f = setmntent("/etc/fstab", "r");
+ fstab_path = strjoin(prefix, "/etc/fstab", NULL);
+ 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", prefix
);
return -errno;
}
return -errno;
}
@@
-396,8
+406,12
@@
static int parse_fstab(void) {
char _cleanup_free_ *where = NULL, *what = NULL;
int k;
char _cleanup_free_ *where = NULL, *what = NULL;
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 = strdup(me->mnt_dir);
+
+ where = strjoin(prefix, me->mnt_dir, NULL);
if (!what || !where) {
r = log_oom();
goto finish;
if (!what || !where) {
r = log_oom();
goto finish;
@@
-406,6
+420,21
@@
static int parse_fstab(void) {
if (is_path(where))
path_kill_slashes(where);
if (is_path(where))
path_kill_slashes(where);
+ if (initrd) {
+ char _cleanup_free_ *mu = NULL, *name = NULL;
+ /* Skip generation, if unit already exists */
+ name = unit_name_from_path(where, ".mount");
+ if (!name)
+ return log_oom();
+ mu = strjoin(arg_dest, "/", name, NULL);
+ if (!mu)
+ return log_oom();
+
+ k = access(mu, R_OK);
+ if (k == 0)
+ continue;
+ }
+
log_debug("Found entry what=%s where=%s type=%s", what, where, me->mnt_type);
if (streq(me->mnt_type, "swap"))
log_debug("Found entry what=%s where=%s type=%s", what, where, me->mnt_type);
if (streq(me->mnt_type, "swap"))
@@
-422,9
+451,8
@@
static int parse_fstab(void) {
isnetwork = mount_is_network(me);
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
isnetwork = mount_is_network(me);
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, false, noauto, nofail,
- automount, isbind, isnetwork,
- "/etc/fstab");
+ me->mnt_passno, noauto, nofail, automount,
+ isbind, isnetwork, initrd, fstab_path);
}
if (k < 0)
}
if (k < 0)
@@
-438,10
+466,18
@@
finish:
static int parse_new_root_from_proc_cmdline(void) {
char *w, *state;
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
, *mu = NULL
;
int r;
size_t l;
int r;
size_t l;
- bool wait = false;
+
+ /* Skip generation, if sysroot.mount already exists */
+ mu = strjoin(arg_dest, "/", "sysroot.mount", NULL);
+ if (!mu)
+ return log_oom();
+
+ r = access(mu, R_OK);
+ if (r == 0)
+ return 0;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@@
-449,8
+485,9
@@
static int parse_new_root_from_proc_cmdline(void) {
return 0;
}
return 0;
}
+ opts = strdup("ro");
type = strdup("auto");
type = strdup("auto");
- if (!type)
+ if (!
opts || !
type)
return log_oom();
/* root= and roofstype= may occur more than once, the last instance should take precedence.
return log_oom();
/* root= and roofstype= may occur more than once, the last instance should take precedence.
@@
-488,8
+525,7
@@
static int parse_new_root_from_proc_cmdline(void) {
if (!opts)
return log_oom();
if (!opts)
return log_oom();
- } else if (streq(word, "rootwait"))
- wait = true;
+ }
free(word);
}
free(word);
}
@@
-497,8
+533,8
@@
static int parse_new_root_from_proc_cmdline(void) {
if (what) {
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
if (what) {
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
- r = add_mount(what, "/sysroot", type, opts, 0,
wait
, false, false,
- false, false,
fals
e, "/proc/cmdline");
+ r = add_mount(what, "/sysroot", type, opts, 0,
false
, false, false,
+ false, false,
tru
e, "/proc/cmdline");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-558,7
+594,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 = 0, 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.");
@@
-577,13
+613,14
@@
int main(int argc, char *argv[]) {
if (parse_proc_cmdline() < 0)
return EXIT_FAILURE;
if (parse_proc_cmdline() < 0)
return EXIT_FAILURE;
- if (
in_initrd()
)
-
k = parse_new_root_from_proc_cmdline(
);
+ if (
arg_enabled
)
+
r = parse_fstab("", false
);
- if (!arg_enabled)
- return EXIT_SUCCESS;
-
- r = parse_fstab();
+ if (in_initrd()) {
+ if (arg_enabled)
+ k = parse_fstab("/sysroot", true);
+ l = parse_new_root_from_proc_cmdline();
+ }
- return (r < 0) || (k < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+ return (r < 0) || (k < 0)
|| (l < 0)
? EXIT_FAILURE : EXIT_SUCCESS;
}
}