clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 23:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount: move device links handling from generator

Browse Source 
This makes mount units work like swap units: when the backing device appears
the mount unit will be started.

v2: the device should want the mount unconditionally, not only for DefaultDependencies=yes
This commit is contained in:
Tom Gundersen
2013-09-11 14:40:59 +02:00
parent b56a422a91
commit 5073f89f10
2 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mount.c
+11 -1
View File
@@ -338,6 +338,12 @@ static bool mount_is_bind(MountParameters *p) {
return false;
}
static bool mount_is_auto(MountParameters *p) {
assert(p);
return !mount_test_option(p->options, "noauto");
}
static bool needs_quota(MountParameters *p) {
assert(p);
@@ -356,6 +362,7 @@ static bool needs_quota(MountParameters *p) {
static int mount_add_device_links(Mount *m) {
MountParameters *p;
bool device_wants_mount = false;
int r;
assert(m);
@@ -376,7 +383,10 @@ static int mount_add_device_links(Mount *m) {
if (path_equal(m->where, "/"))
return 0;
r = unit_add_node_link(UNIT(m), p->what, false);
if (mount_is_auto(p) && UNIT(m)->manager->running_as == SYSTEMD_SYSTEM)
device_wants_mount = true;
r = unit_add_node_link(UNIT(m), p->what, device_wants_mount);
if (r < 0)
return r;
src/fstab-generator/fstab-generator.c
+3 -37
View File
@@ -170,16 +170,6 @@ static int add_swap(const char *what, struct mntent *me) {
return 0;
}
static bool mount_is_bind(struct mntent *me) {
assert(me);
return
hasmntopt(me, "bind") ||
streq(me->mnt_type, "bind") ||
hasmntopt(me, "rbind") ||
streq(me->mnt_type, "rbind");
}
static bool mount_is_network(struct mntent *me) {
assert(me);
@@ -205,14 +195,12 @@ static int add_mount(
bool noauto,
bool nofail,
bool automount,
bool isbind,
const char *post,
const char *source) {
_cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(what);
assert(where);
@@ -296,27 +284,6 @@ static int add_mount(
return -errno;
}
}
if (!isbind &&
!path_equal(where, "/")) {
r = device_name(what, &device);
if (r < 0)
return r;
if (r > 0) {
free(lnk);
lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk)
return log_oom();
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink %s: %m", lnk);
return -errno;
}
}
}
}
if (automount && !path_equal(where, "/")) {
@@ -413,7 +380,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
else {
bool noauto, nofail, automount, isbind;
bool noauto, nofail, automount;
const char *post;
noauto = !!hasmntopt(me, "noauto");
@@ -421,7 +388,6 @@ static int parse_fstab(const char *prefix, bool initrd) {
automount =
hasmntopt(me, "comment=systemd.automount") ||
hasmntopt(me, "x-systemd.automount");
isbind = mount_is_bind(me);
if (initrd) {
post = SPECIAL_INITRD_FS_TARGET;
@@ -435,7 +401,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
k = add_mount(what, where, me->mnt_type, me->mnt_opts,
me->mnt_passno, noauto, nofail, automount,
isbind, post, fstab_path);
post, fstab_path);
}
if (k < 0)
@@ -523,7 +489,7 @@ static int parse_new_root_from_proc_cmdline(void) {
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
false, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
return (r < 0) ? r : 0;
}