picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fstab-generator: drop rootwait support

Browse source 
I originally added this to stay as compatible as possible with the kernel, but
as Lennart argued it is not really useful in the initramfs, so let's drop it (we
already don't support 'rootdealy').
This commit is contained in:
Tom Gundersen 2013-03-01 21:15:51 +01:00
parent 9058482225
commit 533740e161
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -49,8 +49,6 @@ Fedora 19:
Features:
* remove "rootwait" support from fstab generator
* rework specifier logic so that we can distuingish OOM errors from other errors
* systemd-inhibit: refuse taking delay locks

19
src/fstab-generator/fstab-generator.c
View file

@ -192,7 +192,7 @@ static bool mount_is_network(struct mntent *me) {
}
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,
int passno, bool noauto, bool nofail, bool automount, bool isbind, bool isnetwork,
const char *source) {
char _cleanup_free_
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
@ -284,10 +284,6 @@ static int add_mount(const char *what, const char *where, const char *type, cons
"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);
@ -422,9 +418,8 @@ static int parse_fstab(void) {
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, "/etc/fstab");
}
if (k < 0)
@ -441,7 +436,6 @@ static int parse_new_root_from_proc_cmdline(void) {
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
int r;
size_t l;
bool wait = false;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@ -489,8 +483,7 @@ static int parse_new_root_from_proc_cmdline(void) {
if (!opts)
return log_oom();
} else if (streq(word, "rootwait"))
wait = true;
}
free(word);
}
@ -498,8 +491,8 @@ static int parse_new_root_from_proc_cmdline(void) {
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, false, "/proc/cmdline");
r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
false, false, "/proc/cmdline");
if (r < 0)
return r;