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').
-* 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
* rework specifier logic so that we can distuingish OOM errors from other errors
* systemd-inhibit: refuse taking delay locks
}
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,
+ 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,
const char *source) {
char _cleanup_free_
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
- 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);
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, "/etc/fstab");
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
int r;
size_t l;
_cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
int r;
size_t l;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
if (!opts)
return log_oom();
if (!opts)
return log_oom();
- } else if (streq(word, "rootwait"))
- wait = true;
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, false, "/proc/cmdline");
+ r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
+ false, false, "/proc/cmdline");