2012-05-22 19:23:33 +02:00
|
|
|
/***
|
|
|
|
This file is part of systemd.
|
|
|
|
|
|
|
|
Copyright 2012 Lennart Poettering
|
|
|
|
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
systemd is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
|
|
|
|
#include <errno.h>
|
2015-10-24 22:58:24 +02:00
|
|
|
#include <mntent.h>
|
|
|
|
#include <stdio.h>
|
2012-05-22 19:23:33 +02:00
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2015-10-27 03:01:06 +01:00
|
|
|
#include "alloc-util.h"
|
2015-10-25 13:14:12 +01:00
|
|
|
#include "fd-util.h"
|
2015-10-26 18:05:03 +01:00
|
|
|
#include "fileio.h"
|
2015-01-09 22:58:29 +01:00
|
|
|
#include "fstab-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "generator.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "mkdir.h"
|
2012-05-22 19:23:33 +02:00
|
|
|
#include "mount-setup.h"
|
2015-10-26 18:44:13 +01:00
|
|
|
#include "mount-util.h"
|
2015-10-26 16:18:16 +01:00
|
|
|
#include "parse-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "path-util.h"
|
2015-10-27 00:06:29 +01:00
|
|
|
#include "proc-cmdline.h"
|
2012-05-22 19:23:33 +02:00
|
|
|
#include "special.h"
|
2015-10-26 22:01:44 +01:00
|
|
|
#include "stat-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "string-util.h"
|
2014-03-06 17:05:55 +01:00
|
|
|
#include "strv.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "unit-name.h"
|
|
|
|
#include "util.h"
|
2014-03-11 17:57:15 +01:00
|
|
|
#include "virt.h"
|
2016-12-13 12:45:19 +01:00
|
|
|
#include "volatile-util.h"
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
static const char *arg_dest = "/tmp";
|
2016-12-13 12:45:19 +01:00
|
|
|
static const char *arg_dest_late = "/tmp";
|
2014-03-05 22:26:10 +01:00
|
|
|
static bool arg_fstab_enabled = true;
|
2014-03-06 21:14:26 +01:00
|
|
|
static char *arg_root_what = NULL;
|
|
|
|
static char *arg_root_fstype = NULL;
|
|
|
|
static char *arg_root_options = NULL;
|
2016-12-16 12:57:44 +01:00
|
|
|
static char *arg_root_hash = NULL;
|
2014-03-06 21:14:26 +01:00
|
|
|
static int arg_root_rw = -1;
|
2014-10-09 21:37:17 +02:00
|
|
|
static char *arg_usr_what = NULL;
|
|
|
|
static char *arg_usr_fstype = NULL;
|
|
|
|
static char *arg_usr_options = NULL;
|
2016-12-13 12:45:19 +01:00
|
|
|
static VolatileMode arg_volatile_mode = _VOLATILE_MODE_INVALID;
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-11-26 16:36:52 +01:00
|
|
|
static int add_swap(
|
|
|
|
const char *what,
|
|
|
|
struct mntent *me,
|
|
|
|
bool noauto,
|
|
|
|
bool nofail) {
|
|
|
|
|
2015-05-25 12:11:23 +02:00
|
|
|
_cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
|
2013-04-18 09:11:22 +02:00
|
|
|
_cleanup_fclose_ FILE *f = NULL;
|
2015-05-25 12:11:23 +02:00
|
|
|
int r;
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
assert(what);
|
|
|
|
assert(me);
|
|
|
|
|
2015-01-05 12:35:08 +01:00
|
|
|
if (access("/proc/swaps", F_OK) < 0) {
|
|
|
|
log_info("Swap not supported, ignoring fstab swap entry for %s.", what);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-07 13:42:47 +02:00
|
|
|
if (detect_container() > 0) {
|
2014-03-11 17:57:15 +01:00
|
|
|
log_info("Running in a container, ignoring fstab swap entry for %s.", what);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_from_path(what, ".swap", &name);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to generate unit name: %m");
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2016-10-23 17:43:27 +02:00
|
|
|
unit = strjoin(arg_dest, "/", name);
|
2013-01-02 23:15:55 +01:00
|
|
|
if (!unit)
|
|
|
|
return log_oom();
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
f = fopen(unit, "wxe");
|
2016-07-23 02:27:45 +02:00
|
|
|
if (!f)
|
|
|
|
return log_error_errno(errno,
|
|
|
|
errno == EEXIST ?
|
|
|
|
"Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?" :
|
|
|
|
"Failed to create unit file %s: %m",
|
|
|
|
unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
fprintf(f,
|
2013-08-21 16:48:56 +02:00
|
|
|
"# Automatically generated by systemd-fstab-generator\n\n"
|
|
|
|
"[Unit]\n"
|
2014-03-06 18:26:06 +01:00
|
|
|
"SourcePath=/etc/fstab\n"
|
|
|
|
"Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n\n"
|
2012-05-22 19:23:33 +02:00
|
|
|
"[Swap]\n"
|
|
|
|
"What=%s\n",
|
|
|
|
what);
|
|
|
|
|
2015-05-25 12:11:23 +02:00
|
|
|
if (!isempty(me->mnt_opts) && !streq(me->mnt_opts, "defaults"))
|
|
|
|
fprintf(f, "Options=%s\n", me->mnt_opts);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-10-28 14:24:46 +01:00
|
|
|
r = fflush_and_check(f);
|
2014-11-28 18:23:20 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to write unit file %s: %m", unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-06-27 21:03:05 +02:00
|
|
|
/* use what as where, to have a nicer error message */
|
2015-05-25 12:11:23 +02:00
|
|
|
r = generator_write_timeouts(arg_dest, what, what, me->mnt_opts, NULL);
|
2014-06-27 21:03:05 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2013-09-16 01:08:32 +02:00
|
|
|
if (!noauto) {
|
2014-11-26 16:36:52 +01:00
|
|
|
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET,
|
|
|
|
nofail ? ".wants/" : ".requires/", name, NULL);
|
2013-09-16 01:08:32 +02:00
|
|
|
if (!lnk)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
2014-11-28 19:57:32 +01:00
|
|
|
if (symlink(unit, lnk) < 0)
|
|
|
|
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
2013-09-16 01:08:32 +02:00
|
|
|
}
|
|
|
|
|
2013-01-02 23:15:55 +01:00
|
|
|
return 0;
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool mount_is_network(struct mntent *me) {
|
|
|
|
assert(me);
|
|
|
|
|
2015-01-11 06:04:00 +01:00
|
|
|
return fstab_test_option(me->mnt_opts, "_netdev\0") ||
|
|
|
|
fstype_is_network(me->mnt_type);
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
2013-02-22 11:52:36 +01:00
|
|
|
static bool mount_in_initrd(struct mntent *me) {
|
|
|
|
assert(me);
|
|
|
|
|
2015-01-11 06:04:00 +01:00
|
|
|
return fstab_test_option(me->mnt_opts, "x-initrd.mount\0") ||
|
|
|
|
streq(me->mnt_dir, "/usr");
|
2013-02-22 11:52:36 +01:00
|
|
|
}
|
|
|
|
|
2016-11-11 15:08:57 +01:00
|
|
|
static int write_timeout(FILE *f, const char *where, const char *opts,
|
|
|
|
const char *filter, const char *variable) {
|
2015-04-14 22:01:48 +02:00
|
|
|
_cleanup_free_ char *timeout = NULL;
|
|
|
|
char timespan[FORMAT_TIMESPAN_MAX];
|
|
|
|
usec_t u;
|
|
|
|
int r;
|
|
|
|
|
2016-11-11 15:08:57 +01:00
|
|
|
r = fstab_filter_options(opts, filter, NULL, &timeout, NULL);
|
2015-04-14 22:01:48 +02:00
|
|
|
if (r < 0)
|
|
|
|
return log_warning_errno(r, "Failed to parse options: %m");
|
|
|
|
if (r == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
r = parse_sec(timeout, &u);
|
|
|
|
if (r < 0) {
|
|
|
|
log_warning("Failed to parse timeout for %s, ignoring: %s", where, timeout);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-11 15:08:57 +01:00
|
|
|
fprintf(f, "%s=%s\n", variable, format_timespan(timespan, sizeof(timespan), u, 0));
|
2015-04-14 22:01:48 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-05-02 19:01:29 +02:00
|
|
|
|
2016-11-11 15:08:57 +01:00
|
|
|
static int write_idle_timeout(FILE *f, const char *where, const char *opts) {
|
|
|
|
return write_timeout(f, where, opts,
|
|
|
|
"x-systemd.idle-timeout\0", "TimeoutIdleSec");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_mount_timeout(FILE *f, const char *where, const char *opts) {
|
|
|
|
return write_timeout(f, where, opts,
|
|
|
|
"x-systemd.mount-timeout\0", "TimeoutSec");
|
|
|
|
}
|
|
|
|
|
2015-05-18 12:30:37 +02:00
|
|
|
static int write_requires_after(FILE *f, const char *opts) {
|
|
|
|
_cleanup_strv_free_ char **names = NULL, **units = NULL;
|
|
|
|
_cleanup_free_ char *res = NULL;
|
|
|
|
char **s;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(opts);
|
|
|
|
|
|
|
|
r = fstab_extract_values(opts, "x-systemd.requires", &names);
|
|
|
|
if (r < 0)
|
|
|
|
return log_warning_errno(r, "Failed to parse options: %m");
|
|
|
|
if (r == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
STRV_FOREACH(s, names) {
|
|
|
|
char *x;
|
|
|
|
|
|
|
|
r = unit_name_mangle_with_suffix(*s, UNIT_NAME_NOGLOB, ".mount", &x);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to generate unit name: %m");
|
|
|
|
r = strv_consume(&units, x);
|
|
|
|
if (r < 0)
|
|
|
|
return log_oom();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (units) {
|
|
|
|
res = strv_join(units, " ");
|
|
|
|
if (!res)
|
|
|
|
return log_oom();
|
|
|
|
fprintf(f, "After=%1$s\nRequires=%1$s\n", res);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_requires_mounts_for(FILE *f, const char *opts) {
|
|
|
|
_cleanup_strv_free_ char **paths = NULL;
|
|
|
|
_cleanup_free_ char *res = NULL;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(opts);
|
|
|
|
|
|
|
|
r = fstab_extract_values(opts, "x-systemd.requires-mounts-for", &paths);
|
|
|
|
if (r < 0)
|
|
|
|
return log_warning_errno(r, "Failed to parse options: %m");
|
|
|
|
if (r == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
res = strv_join(paths, " ");
|
|
|
|
if (!res)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
fprintf(f, "RequiresMountsFor=%s\n", res);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-03-25 22:04:40 +01:00
|
|
|
static int add_mount(
|
2016-12-13 12:45:19 +01:00
|
|
|
const char *dest,
|
2013-03-25 22:04:40 +01:00
|
|
|
const char *what,
|
|
|
|
const char *where,
|
2014-03-06 21:14:26 +01:00
|
|
|
const char *fstype,
|
2013-03-25 22:04:40 +01:00
|
|
|
const char *opts,
|
|
|
|
int passno,
|
|
|
|
bool noauto,
|
|
|
|
bool nofail,
|
|
|
|
bool automount,
|
|
|
|
const char *post,
|
|
|
|
const char *source) {
|
2014-03-05 22:26:10 +01:00
|
|
|
|
2013-04-18 09:11:22 +02:00
|
|
|
_cleanup_free_ char
|
2013-09-18 00:30:47 +02:00
|
|
|
*name = NULL, *unit = NULL, *lnk = NULL,
|
2014-06-27 18:12:07 +02:00
|
|
|
*automount_name = NULL, *automount_unit = NULL,
|
|
|
|
*filtered = NULL;
|
2013-04-18 09:11:22 +02:00
|
|
|
_cleanup_fclose_ FILE *f = NULL;
|
fsck,fstab-generator: be lenient about missing fsck.<type>
If fstab contains 1 for passno, treat this as an error, but only warn
briefly. If fstab doesn't contain this information, don't complain at
all.
Patch is complicated a bit by the fact that we might have the fstype specified
in fstab or on /proc/cmdline, in which case we can check if we have the appropriate
fsck tool, or not specified, or specified as auto, in which case we have to look
and check the type of the filesystem ourselves. It cannot be done before the
device appears, so it is too early in the generator phase, and it must be done
directly in fsck service.
2013-11-12 06:53:59 +01:00
|
|
|
int r;
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
assert(what);
|
|
|
|
assert(where);
|
2012-11-23 03:41:13 +01:00
|
|
|
assert(opts);
|
2015-11-25 21:21:44 +01:00
|
|
|
assert(post);
|
2012-11-23 03:41:13 +01:00
|
|
|
assert(source);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-03-06 21:14:26 +01:00
|
|
|
if (streq_ptr(fstype, "autofs"))
|
2012-05-22 19:23:33 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!is_path(where)) {
|
|
|
|
log_warning("Mount point %s is not a valid path, ignoring.", where);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mount_point_is_api(where) ||
|
|
|
|
mount_point_ignore(where))
|
|
|
|
return 0;
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
if (path_equal(where, "/")) {
|
2015-05-02 19:01:29 +02:00
|
|
|
if (noauto)
|
|
|
|
log_warning("Ignoring \"noauto\" for root device");
|
|
|
|
if (nofail)
|
|
|
|
log_warning("Ignoring \"nofail\" for root device");
|
|
|
|
if (automount)
|
|
|
|
log_warning("Ignoring automount option for root device");
|
|
|
|
|
|
|
|
noauto = nofail = automount = false;
|
2014-03-05 22:26:10 +01:00
|
|
|
}
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_from_path(where, ".mount", &name);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to generate unit name: %m");
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
unit = strjoin(dest, "/", name);
|
2013-01-02 23:15:55 +01:00
|
|
|
if (!unit)
|
|
|
|
return log_oom();
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
f = fopen(unit, "wxe");
|
2016-07-23 02:27:45 +02:00
|
|
|
if (!f)
|
|
|
|
return log_error_errno(errno,
|
|
|
|
errno == EEXIST ?
|
|
|
|
"Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?" :
|
|
|
|
"Failed to create unit file %s: %m",
|
|
|
|
unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2012-11-23 03:41:13 +01:00
|
|
|
fprintf(f,
|
2014-03-06 18:26:06 +01:00
|
|
|
"# Automatically generated by systemd-fstab-generator\n\n"
|
|
|
|
"[Unit]\n"
|
|
|
|
"SourcePath=%s\n"
|
|
|
|
"Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n",
|
|
|
|
source);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2015-11-25 21:21:44 +01:00
|
|
|
if (!noauto && !nofail && !automount)
|
2014-03-07 02:39:59 +01:00
|
|
|
fprintf(f, "Before=%s\n", post);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2015-05-18 12:30:37 +02:00
|
|
|
if (!automount && opts) {
|
|
|
|
r = write_requires_after(f, opts);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
r = write_requires_mounts_for(f, opts);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
if (passno != 0) {
|
2016-12-13 12:45:19 +01:00
|
|
|
r = generator_write_fsck_deps(f, dest, what, where, fstype);
|
2014-03-05 22:26:10 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
2013-09-30 01:34:44 +02:00
|
|
|
|
2012-05-22 19:23:33 +02:00
|
|
|
fprintf(f,
|
|
|
|
"\n"
|
|
|
|
"[Mount]\n"
|
|
|
|
"What=%s\n"
|
2014-03-06 21:14:26 +01:00
|
|
|
"Where=%s\n",
|
2012-05-22 19:23:33 +02:00
|
|
|
what,
|
2014-03-06 21:14:26 +01:00
|
|
|
where);
|
|
|
|
|
|
|
|
if (!isempty(fstype) && !streq(fstype, "auto"))
|
|
|
|
fprintf(f, "Type=%s\n", fstype);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
r = generator_write_timeouts(dest, what, where, opts, &filtered);
|
2014-06-27 18:12:07 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2016-11-11 15:08:57 +01:00
|
|
|
r = write_mount_timeout(f, where, opts);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2014-06-27 18:12:07 +02:00
|
|
|
if (!isempty(filtered) && !streq(filtered, "defaults"))
|
|
|
|
fprintf(f, "Options=%s\n", filtered);
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2015-05-17 00:11:12 +02:00
|
|
|
r = fflush_and_check(f);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to write unit file %s: %m", unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
fstab-generator: fix automount option and don't start associated mount unit at boot
Without this patch applied the mount unit with 'automount' option was still
pulled by local-fs.target and thus was activated during the boot process which
defeats the purpose of the 'automount' option:
$ grep /mnt /etc/fstab
/dev/vdb1 /mnt ext2 defaults,x-systemd.automount 0 0
$ reboot
...
$ mount | grep mnt
systemd-1 on /mnt type autofs (rw,relatime,fd=34,pgrp=1,timeout=0,minproto=5,maxproto=5,direct)
/dev/vdb1 on /mnt type ext2 (rw,relatime)
$ systemctl status mnt.mount | grep Active
Active: active (mounted) since Thu 2016-03-03 21:36:22 CET; 42s ago
With the patch applied:
$ reboot
...
$ mount | grep mnt
systemd-1 on /mnt type autofs (rw,relatime,fd=22,pgrp=1,timeout=0,minproto=5,maxproto=5,direct)
$ systemctl status mnt.mount | grep Active
Active: inactive (dead)
$ ls /mnt
lost+found
$ systemctl status mnt.mount | grep Active
Active: active (mounted) since Thu 2016-03-03 21:47:32 CET; 4s ago
2015-12-01 18:01:44 +01:00
|
|
|
if (!noauto && !automount) {
|
2016-12-13 12:45:19 +01:00
|
|
|
lnk = strjoin(dest, "/", post, nofail ? ".wants/" : ".requires/", name);
|
2014-03-07 02:39:59 +01:00
|
|
|
if (!lnk)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
2014-11-28 19:57:32 +01:00
|
|
|
if (symlink(unit, lnk) < 0)
|
|
|
|
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
if (automount) {
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_from_path(where, ".automount", &automount_name);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to generate unit name: %m");
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
automount_unit = strjoin(dest, "/", automount_name);
|
2013-01-02 23:15:55 +01:00
|
|
|
if (!automount_unit)
|
|
|
|
return log_oom();
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
fclose(f);
|
|
|
|
f = fopen(automount_unit, "wxe");
|
2014-11-28 19:57:32 +01:00
|
|
|
if (!f)
|
|
|
|
return log_error_errno(errno, "Failed to create unit file %s: %m", automount_unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
fprintf(f,
|
|
|
|
"# Automatically generated by systemd-fstab-generator\n\n"
|
|
|
|
"[Unit]\n"
|
2014-03-06 18:26:06 +01:00
|
|
|
"SourcePath=%s\n"
|
|
|
|
"Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n",
|
2013-03-04 19:01:05 +01:00
|
|
|
source);
|
|
|
|
|
2015-11-25 21:21:44 +01:00
|
|
|
fprintf(f, "Before=%s\n", post);
|
2013-03-04 19:01:05 +01:00
|
|
|
|
2015-05-18 12:30:37 +02:00
|
|
|
if (opts) {
|
|
|
|
r = write_requires_after(f, opts);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
r = write_requires_mounts_for(f, opts);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2013-03-04 19:01:05 +01:00
|
|
|
fprintf(f,
|
2016-05-02 16:02:02 +02:00
|
|
|
"\n"
|
2012-05-22 19:23:33 +02:00
|
|
|
"[Automount]\n"
|
|
|
|
"Where=%s\n",
|
|
|
|
where);
|
|
|
|
|
2015-05-02 19:01:28 +02:00
|
|
|
r = write_idle_timeout(f, where, opts);
|
2015-04-14 22:01:48 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2015-05-17 00:11:12 +02:00
|
|
|
r = fflush_and_check(f);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to write unit file %s: %m", automount_unit);
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
free(lnk);
|
2016-12-13 12:45:19 +01:00
|
|
|
lnk = strjoin(dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name);
|
2013-01-02 23:15:55 +01:00
|
|
|
if (!lnk)
|
|
|
|
return log_oom();
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2012-05-31 12:40:20 +02:00
|
|
|
mkdir_parents_label(lnk, 0755);
|
2014-11-28 19:57:32 +01:00
|
|
|
if (symlink(automount_unit, lnk) < 0)
|
|
|
|
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
2013-01-02 23:15:55 +01:00
|
|
|
return 0;
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
static int parse_fstab(bool initrd) {
|
2014-03-06 21:14:26 +01:00
|
|
|
_cleanup_endmntent_ FILE *f = NULL;
|
2014-03-05 22:26:10 +01:00
|
|
|
const char *fstab_path;
|
2012-05-22 19:23:33 +02:00
|
|
|
struct mntent *me;
|
2014-03-05 22:26:10 +01:00
|
|
|
int r = 0;
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
fstab_path = initrd ? "/sysroot/etc/fstab" : "/etc/fstab";
|
|
|
|
f = setmntent(fstab_path, "re");
|
2012-05-22 19:23:33 +02:00
|
|
|
if (!f) {
|
|
|
|
if (errno == ENOENT)
|
|
|
|
return 0;
|
|
|
|
|
2016-06-24 21:22:05 +02:00
|
|
|
return log_error_errno(errno, "Failed to open %s: %m", fstab_path);
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
while ((me = getmntent(f))) {
|
2013-04-18 09:11:22 +02:00
|
|
|
_cleanup_free_ char *where = NULL, *what = NULL;
|
2014-11-26 16:36:52 +01:00
|
|
|
bool noauto, nofail;
|
2012-05-22 19:23:33 +02:00
|
|
|
int k;
|
|
|
|
|
2013-02-22 11:52:36 +01:00
|
|
|
if (initrd && !mount_in_initrd(me))
|
|
|
|
continue;
|
|
|
|
|
2012-05-22 19:23:33 +02:00
|
|
|
what = fstab_node_to_udev_node(me->mnt_fsname);
|
2014-03-05 22:26:10 +01:00
|
|
|
if (!what)
|
|
|
|
return log_oom();
|
|
|
|
|
2015-01-05 12:35:08 +01:00
|
|
|
if (is_device_path(what) && path_is_read_only_fs("sys") > 0) {
|
2014-03-11 17:57:15 +01:00
|
|
|
log_info("Running in a container, ignoring fstab device entry for %s.", what);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
where = initrd ? strappend("/sysroot/", me->mnt_dir) : strdup(me->mnt_dir);
|
|
|
|
if (!where)
|
2013-10-04 04:13:55 +02:00
|
|
|
return log_oom();
|
2012-05-22 19:23:33 +02:00
|
|
|
|
fstab-generator: avoid mangling of mount source string
This is a valid source entry in /etc/fstab:
//192.168.6.10/data /data cifs noperm,auto
On Mon, Jun 4, 2012 at 2:04 PM, Dave Reisner <d@falconindy.com> wrote:
> On Mon, Jun 04, 2012 at 12:57:47PM +0200, Kay Sievers wrote:
>>
>> Changed it to use:
>> path_is_absolute()
>> instead of:
>> is_path(),
>> so that we still sanitize the input we might match against.
>>
>> Let me know, if you think that could still cause any problems?
> Yes, this will still break CIFS shares.
2012-06-04 15:21:05 +02:00
|
|
|
if (is_path(where))
|
2012-05-22 19:23:33 +02:00
|
|
|
path_kill_slashes(where);
|
|
|
|
|
2015-01-11 06:04:00 +01:00
|
|
|
noauto = fstab_test_yes_no_option(me->mnt_opts, "noauto\0" "auto\0");
|
|
|
|
nofail = fstab_test_yes_no_option(me->mnt_opts, "nofail\0" "fail\0");
|
2014-11-26 16:36:52 +01:00
|
|
|
log_debug("Found entry what=%s where=%s type=%s nofail=%s noauto=%s",
|
|
|
|
what, where, me->mnt_type,
|
|
|
|
yes_no(noauto), yes_no(nofail));
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
if (streq(me->mnt_type, "swap"))
|
2014-11-26 16:36:52 +01:00
|
|
|
k = add_swap(what, me, noauto, nofail);
|
2012-11-23 03:41:13 +01:00
|
|
|
else {
|
2014-11-26 16:36:52 +01:00
|
|
|
bool automount;
|
2013-08-19 03:20:52 +02:00
|
|
|
const char *post;
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2015-01-11 06:04:00 +01:00
|
|
|
automount = fstab_test_option(me->mnt_opts,
|
|
|
|
"comment=systemd.automount\0"
|
|
|
|
"x-systemd.automount\0");
|
2014-03-05 22:26:10 +01:00
|
|
|
if (initrd)
|
2013-03-04 19:01:05 +01:00
|
|
|
post = SPECIAL_INITRD_FS_TARGET;
|
2014-03-05 22:26:10 +01:00
|
|
|
else if (mount_is_network(me))
|
2013-03-28 21:18:58 +01:00
|
|
|
post = SPECIAL_REMOTE_FS_TARGET;
|
2014-03-05 22:26:10 +01:00
|
|
|
else
|
2013-03-28 21:18:58 +01:00
|
|
|
post = SPECIAL_LOCAL_FS_TARGET;
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
k = add_mount(arg_dest,
|
|
|
|
what,
|
2014-03-06 21:14:26 +01:00
|
|
|
where,
|
|
|
|
me->mnt_type,
|
|
|
|
me->mnt_opts,
|
|
|
|
me->mnt_passno,
|
|
|
|
noauto,
|
|
|
|
nofail,
|
|
|
|
automount,
|
|
|
|
post,
|
|
|
|
fstab_path);
|
2012-11-23 03:41:13 +01:00
|
|
|
}
|
2012-05-22 19:23:33 +02:00
|
|
|
|
|
|
|
if (k < 0)
|
|
|
|
r = k;
|
|
|
|
}
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2015-05-02 19:01:29 +02:00
|
|
|
static int add_sysroot_mount(void) {
|
2014-06-23 20:11:30 +02:00
|
|
|
_cleanup_free_ char *what = NULL;
|
|
|
|
const char *opts;
|
2016-05-12 18:42:39 +02:00
|
|
|
int r;
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2015-03-25 00:05:38 +01:00
|
|
|
if (isempty(arg_root_what)) {
|
|
|
|
log_debug("Could not find a root= entry on the kernel command line.");
|
|
|
|
return 0;
|
2013-03-04 21:00:56 +01:00
|
|
|
}
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2016-06-07 10:23:20 +02:00
|
|
|
if (streq(arg_root_what, "gpt-auto")) {
|
|
|
|
/* This is handled by the gpt-auto generator */
|
|
|
|
log_debug("Skipping root directory handling, as gpt-auto was requested.");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-24 20:59:51 +02:00
|
|
|
if (path_equal(arg_root_what, "/dev/nfs")) {
|
2016-06-23 18:47:03 +02:00
|
|
|
/* This is handled by the kernel or the initrd */
|
|
|
|
log_debug("Skipping root directory handling, as /dev/nfs was requested.");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-25 00:05:38 +01:00
|
|
|
what = fstab_node_to_udev_node(arg_root_what);
|
|
|
|
if (!what)
|
2015-04-08 20:27:11 +02:00
|
|
|
return log_oom();
|
2015-03-25 00:05:38 +01:00
|
|
|
|
2014-03-06 21:14:26 +01:00
|
|
|
if (!arg_root_options)
|
2014-06-23 20:11:30 +02:00
|
|
|
opts = arg_root_rw > 0 ? "rw" : "ro";
|
|
|
|
else if (arg_root_rw >= 0 ||
|
2015-01-09 22:58:29 +01:00
|
|
|
!fstab_test_option(arg_root_options, "ro\0" "rw\0"))
|
2015-02-03 02:05:59 +01:00
|
|
|
opts = strjoina(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
|
2014-06-23 20:11:30 +02:00
|
|
|
else
|
|
|
|
opts = arg_root_options;
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2014-03-06 21:14:26 +01:00
|
|
|
log_debug("Found entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
|
2016-05-12 18:42:39 +02:00
|
|
|
|
|
|
|
if (is_device_path(what)) {
|
|
|
|
r = generator_write_initrd_root_device_deps(arg_dest, what);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
return add_mount(arg_dest,
|
|
|
|
what,
|
2014-03-06 21:14:26 +01:00
|
|
|
"/sysroot",
|
|
|
|
arg_root_fstype,
|
2014-06-23 20:11:30 +02:00
|
|
|
opts,
|
2016-06-24 21:07:18 +02:00
|
|
|
is_device_path(what) ? 1 : 0, /* passno */
|
|
|
|
false, /* noauto off */
|
|
|
|
false, /* nofail off */
|
|
|
|
false, /* automount off */
|
2014-03-06 21:14:26 +01:00
|
|
|
SPECIAL_INITRD_ROOT_FS_TARGET,
|
|
|
|
"/proc/cmdline");
|
2012-11-23 03:41:13 +01:00
|
|
|
}
|
|
|
|
|
2015-05-02 19:01:29 +02:00
|
|
|
static int add_sysroot_usr_mount(void) {
|
2014-10-09 21:37:17 +02:00
|
|
|
_cleanup_free_ char *what = NULL;
|
|
|
|
const char *opts;
|
|
|
|
|
|
|
|
if (!arg_usr_what && !arg_usr_fstype && !arg_usr_options)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (arg_root_what && !arg_usr_what) {
|
2016-06-24 21:00:11 +02:00
|
|
|
/* Copy over the root device, in case the /usr mount just differs in a mount option (consider btrfs subvolumes) */
|
2014-10-09 21:37:17 +02:00
|
|
|
arg_usr_what = strdup(arg_root_what);
|
|
|
|
if (!arg_usr_what)
|
|
|
|
return log_oom();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_root_fstype && !arg_usr_fstype) {
|
|
|
|
arg_usr_fstype = strdup(arg_root_fstype);
|
|
|
|
if (!arg_usr_fstype)
|
|
|
|
return log_oom();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_root_options && !arg_usr_options) {
|
|
|
|
arg_usr_options = strdup(arg_root_options);
|
|
|
|
if (!arg_usr_options)
|
|
|
|
return log_oom();
|
|
|
|
}
|
|
|
|
|
2014-12-08 20:05:31 +01:00
|
|
|
if (!arg_usr_what)
|
2014-10-09 21:37:17 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
what = fstab_node_to_udev_node(arg_usr_what);
|
2016-06-24 21:01:22 +02:00
|
|
|
if (!what)
|
|
|
|
return log_oom();
|
2014-10-09 21:37:17 +02:00
|
|
|
|
2014-12-08 20:05:31 +01:00
|
|
|
if (!arg_usr_options)
|
|
|
|
opts = arg_root_rw > 0 ? "rw" : "ro";
|
2015-01-09 22:58:29 +01:00
|
|
|
else if (!fstab_test_option(arg_usr_options, "ro\0" "rw\0"))
|
2015-02-03 02:05:59 +01:00
|
|
|
opts = strjoina(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");
|
2014-12-08 20:05:31 +01:00
|
|
|
else
|
|
|
|
opts = arg_usr_options;
|
2014-10-09 21:37:17 +02:00
|
|
|
|
|
|
|
log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
|
2016-12-13 12:45:19 +01:00
|
|
|
return add_mount(arg_dest,
|
|
|
|
what,
|
2014-10-09 21:37:17 +02:00
|
|
|
"/sysroot/usr",
|
|
|
|
arg_usr_fstype,
|
|
|
|
opts,
|
2016-06-24 21:07:18 +02:00
|
|
|
is_device_path(what) ? 1 : 0, /* passno */
|
|
|
|
false, /* noauto off */
|
|
|
|
false, /* nofail off */
|
|
|
|
false, /* automount off */
|
2016-01-17 10:58:40 +01:00
|
|
|
SPECIAL_INITRD_FS_TARGET,
|
2014-10-09 21:37:17 +02:00
|
|
|
"/proc/cmdline");
|
|
|
|
}
|
|
|
|
|
2016-12-13 12:45:19 +01:00
|
|
|
static int add_volatile_root(void) {
|
|
|
|
const char *from, *to;
|
|
|
|
|
|
|
|
if (arg_volatile_mode != VOLATILE_YES)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Let's add in systemd-remount-volatile.service which will remount the root device to tmpfs if this is
|
|
|
|
* requested, leaving only /usr from the root mount inside. */
|
|
|
|
|
|
|
|
from = strjoina(SYSTEM_DATA_UNIT_PATH "/systemd-volatile-root.service");
|
|
|
|
to = strjoina(arg_dest, "/" SPECIAL_INITRD_ROOT_FS_TARGET, ".requires/systemd-volatile-root.service");
|
|
|
|
|
|
|
|
(void) mkdir_parents(to, 0755);
|
|
|
|
|
|
|
|
if (symlink(from, to) < 0)
|
|
|
|
return log_error_errno(errno, "Failed to hook in volatile remount service: %m");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int add_volatile_var(void) {
|
|
|
|
|
|
|
|
if (arg_volatile_mode != VOLATILE_STATE)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* If requested, mount /var as tmpfs, but do so only if there's nothing else defined for this. */
|
|
|
|
|
|
|
|
return add_mount(arg_dest_late,
|
|
|
|
"tmpfs",
|
|
|
|
"/var",
|
|
|
|
"tmpfs",
|
|
|
|
"mode=0755",
|
|
|
|
0,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
SPECIAL_LOCAL_FS_TARGET,
|
|
|
|
"/proc/cmdline");
|
|
|
|
}
|
|
|
|
|
2016-10-22 20:24:52 +02:00
|
|
|
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
|
2013-11-06 03:15:16 +01:00
|
|
|
int r;
|
2012-06-22 10:27:05 +02:00
|
|
|
|
2014-10-09 21:37:17 +02:00
|
|
|
/* root=, usr=, usrfstype= and roofstype= may occur more than once, the last
|
|
|
|
* instance should take precedence. In the case of multiple rootflags=
|
|
|
|
* or usrflags= the arguments should be concatenated */
|
2014-03-06 21:14:26 +01:00
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
if (STR_IN_SET(key, "fstab", "rd.fstab")) {
|
2014-03-05 22:26:10 +01:00
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
r = value ? parse_boolean(value) : 1;
|
2014-02-16 00:08:59 +01:00
|
|
|
if (r < 0)
|
2014-03-06 17:05:55 +01:00
|
|
|
log_warning("Failed to parse fstab switch %s. Ignoring.", value);
|
2014-02-16 00:08:59 +01:00
|
|
|
else
|
2014-03-05 22:26:10 +01:00
|
|
|
arg_fstab_enabled = r;
|
2012-06-22 10:27:05 +02:00
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "root")) {
|
|
|
|
|
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
2014-03-06 21:14:26 +01:00
|
|
|
|
2014-10-04 02:41:43 +02:00
|
|
|
if (free_and_strdup(&arg_root_what, value) < 0)
|
2014-03-06 21:14:26 +01:00
|
|
|
return log_oom();
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "rootfstype")) {
|
|
|
|
|
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
2014-03-06 21:14:26 +01:00
|
|
|
|
2014-10-04 02:41:43 +02:00
|
|
|
if (free_and_strdup(&arg_root_fstype, value) < 0)
|
2014-03-06 21:14:26 +01:00
|
|
|
return log_oom();
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "rootflags")) {
|
2014-03-06 21:14:26 +01:00
|
|
|
char *o;
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
|
|
|
|
2014-03-06 21:14:26 +01:00
|
|
|
o = arg_root_options ?
|
2016-10-23 17:43:27 +02:00
|
|
|
strjoin(arg_root_options, ",", value) :
|
2014-03-06 21:14:26 +01:00
|
|
|
strdup(value);
|
|
|
|
if (!o)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
free(arg_root_options);
|
|
|
|
arg_root_options = o;
|
2016-12-16 12:57:44 +01:00
|
|
|
} else if (streq(key, "roothash")) {
|
|
|
|
|
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (free_and_strdup(&arg_root_hash, value) < 0)
|
|
|
|
return log_oom();
|
2014-03-06 21:14:26 +01:00
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "mount.usr")) {
|
|
|
|
|
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
2014-10-09 21:37:17 +02:00
|
|
|
|
|
|
|
if (free_and_strdup(&arg_usr_what, value) < 0)
|
|
|
|
return log_oom();
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "mount.usrfstype")) {
|
|
|
|
|
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
2014-10-09 21:37:17 +02:00
|
|
|
|
|
|
|
if (free_and_strdup(&arg_usr_fstype, value) < 0)
|
|
|
|
return log_oom();
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
} else if (streq(key, "mount.usrflags")) {
|
2014-10-09 21:37:17 +02:00
|
|
|
char *o;
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
if (proc_cmdline_value_missing(key, value))
|
|
|
|
return 0;
|
|
|
|
|
2014-10-09 21:37:17 +02:00
|
|
|
o = arg_usr_options ?
|
2016-10-23 17:43:27 +02:00
|
|
|
strjoin(arg_usr_options, ",", value) :
|
2014-10-09 21:37:17 +02:00
|
|
|
strdup(value);
|
|
|
|
if (!o)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
free(arg_usr_options);
|
|
|
|
arg_usr_options = o;
|
|
|
|
|
2014-03-06 21:14:26 +01:00
|
|
|
} else if (streq(key, "rw") && !value)
|
|
|
|
arg_root_rw = true;
|
|
|
|
else if (streq(key, "ro") && !value)
|
|
|
|
arg_root_rw = false;
|
2016-12-13 12:45:19 +01:00
|
|
|
else if (streq(key, "systemd.volatile")) {
|
|
|
|
VolatileMode m;
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
m = volatile_mode_from_string(value);
|
|
|
|
if (m < 0)
|
|
|
|
log_warning("Failed to parse systemd.volatile= argument: %s", value);
|
|
|
|
else
|
|
|
|
arg_volatile_mode = m;
|
|
|
|
} else
|
|
|
|
arg_volatile_mode = VOLATILE_YES;
|
|
|
|
}
|
2012-06-22 10:27:05 +02:00
|
|
|
|
2013-01-02 23:15:55 +01:00
|
|
|
return 0;
|
2012-06-22 10:27:05 +02:00
|
|
|
}
|
|
|
|
|
2016-12-16 12:57:44 +01:00
|
|
|
static int determine_root(void) {
|
|
|
|
/* If we have a root hash but no root device then Verity is used, and we use the "root" DM device as root. */
|
|
|
|
|
|
|
|
if (arg_root_what)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!arg_root_hash)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
arg_root_what = strdup("/dev/mapper/root");
|
|
|
|
if (!arg_root_what)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
log_info("Using verity root device %s.", arg_root_what);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-05-22 19:23:33 +02:00
|
|
|
int main(int argc, char *argv[]) {
|
2014-03-05 22:26:10 +01:00
|
|
|
int r = 0;
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2012-05-23 03:43:29 +02:00
|
|
|
if (argc > 1 && argc != 4) {
|
|
|
|
log_error("This program takes three or no arguments.");
|
2012-05-22 19:23:33 +02:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 1)
|
|
|
|
arg_dest = argv[1];
|
2016-12-13 12:45:19 +01:00
|
|
|
if (argc > 3)
|
|
|
|
arg_dest_late = argv[3];
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2012-05-22 22:00:37 +02:00
|
|
|
log_set_target(LOG_TARGET_SAFE);
|
2012-05-22 19:23:33 +02:00
|
|
|
log_parse_environment();
|
|
|
|
log_open();
|
|
|
|
|
|
|
|
umask(0022);
|
|
|
|
|
util-lib: various improvements to kernel command line parsing
This improves kernel command line parsing in a number of ways:
a) An kernel option "foo_bar=xyz" is now considered equivalent to
"foo-bar-xyz", i.e. when comparing kernel command line option names "-" and
"_" are now considered equivalent (this only applies to the option names
though, not the option values!). Most of our kernel options used "-" as word
separator in kernel command line options so far, but some used "_". With
this change, which was a source of confusion for users (well, at least of
one user: myself, I just couldn't remember that it's systemd.debug-shell,
not systemd.debug_shell). Considering both as equivalent is inspired how
modern kernel module loading normalizes all kernel module names to use
underscores now too.
b) All options previously using a dash for separating words in kernel command
line options now use an underscore instead, in all documentation and in
code. Since a) has been implemented this should not create any compatibility
problems, but normalizes our documentation and our code.
c) All kernel command line options which take booleans (or are boolean-like)
have been reworked so that "foobar" (without argument) is now equivalent to
"foobar=1" (but not "foobar=0"), thus normalizing the handling of our
boolean arguments. Specifically this means systemd.debug-shell and
systemd_debug_shell=1 are now entirely equivalent.
d) All kernel command line options which take an argument, and where no
argument is specified will now result in a log message. e.g. passing just
"systemd.unit" will no result in a complain that it needs an argument. This
is implemented in the proc_cmdline_missing_value() function.
e) There's now a call proc_cmdline_get_bool() similar to proc_cmdline_get_key()
that parses booleans (following the logic explained in c).
f) The proc_cmdline_parse() call's boolean argument has been replaced by a new
flags argument that takes a common set of bits with proc_cmdline_get_key().
g) All kernel command line APIs now begin with the same "proc_cmdline_" prefix.
h) There are now tests for much of this. Yay!
2016-12-12 18:29:15 +01:00
|
|
|
r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, 0);
|
2014-11-06 21:53:34 +01:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
|
2012-06-22 10:27:05 +02:00
|
|
|
|
2016-12-16 12:57:44 +01:00
|
|
|
(void) determine_root();
|
|
|
|
|
2014-10-09 21:37:17 +02:00
|
|
|
/* Always honour root= and usr= in the kernel command line if we are in an initrd */
|
|
|
|
if (in_initrd()) {
|
2016-06-24 21:04:48 +02:00
|
|
|
int k;
|
|
|
|
|
2015-05-02 19:01:29 +02:00
|
|
|
r = add_sysroot_mount();
|
2016-06-24 21:04:48 +02:00
|
|
|
|
|
|
|
k = add_sysroot_usr_mount();
|
|
|
|
if (k < 0)
|
|
|
|
r = k;
|
2016-12-13 12:45:19 +01:00
|
|
|
|
|
|
|
k = add_volatile_root();
|
|
|
|
if (k < 0)
|
|
|
|
r = k;
|
2016-06-24 21:04:48 +02:00
|
|
|
} else
|
2016-12-13 12:45:19 +01:00
|
|
|
r = add_volatile_var();
|
2012-11-23 03:41:13 +01:00
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
/* Honour /etc/fstab only when that's enabled */
|
|
|
|
if (arg_fstab_enabled) {
|
|
|
|
int k;
|
2013-03-05 06:45:06 +01:00
|
|
|
|
2014-06-23 20:11:30 +02:00
|
|
|
log_debug("Parsing /etc/fstab");
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
/* Parse the local /etc/fstab, possibly from the initrd */
|
|
|
|
k = parse_fstab(false);
|
|
|
|
if (k < 0)
|
|
|
|
r = k;
|
2013-03-05 06:45:06 +01:00
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
/* If running in the initrd also parse the /etc/fstab from the host */
|
|
|
|
if (in_initrd()) {
|
2014-06-23 20:11:30 +02:00
|
|
|
log_debug("Parsing /sysroot/etc/fstab");
|
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
k = parse_fstab(true);
|
|
|
|
if (k < 0)
|
|
|
|
r = k;
|
|
|
|
}
|
|
|
|
}
|
2012-05-22 19:23:33 +02:00
|
|
|
|
2014-07-08 00:36:03 +02:00
|
|
|
free(arg_root_what);
|
2014-12-09 02:22:44 +01:00
|
|
|
free(arg_root_fstype);
|
|
|
|
free(arg_root_options);
|
2016-12-16 12:57:44 +01:00
|
|
|
free(arg_root_hash);
|
2014-12-09 02:22:44 +01:00
|
|
|
|
|
|
|
free(arg_usr_what);
|
|
|
|
free(arg_usr_fstype);
|
|
|
|
free(arg_usr_options);
|
2014-07-08 00:36:03 +02:00
|
|
|
|
2014-03-05 22:26:10 +01:00
|
|
|
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
2012-05-22 19:23:33 +02:00
|
|
|
}
|