diff options
| author | brulon <barron@lexmark.com> | 2016-08-26 11:57:22 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-08-26 17:57:22 +0200 |
| commit | e520950a03419957875034bc27795b0b81d8e793 (patch) | |
| tree | 09fb51201acc7e7da2dbececdf887db3af6b362e /src/core/mount.c | |
| parent | 6431c7e216ceb9f3cfe073c94a47ac413b892e55 (diff) | |
mount: add new LazyUnmount= setting for mount units, mapping to umount(8)'s "-l" switch (#3827)
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index f2ac8d171f..2c2a54edbb 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -677,7 +677,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { "%sOptions: %s\n" "%sFrom /proc/self/mountinfo: %s\n" "%sFrom fragment: %s\n" - "%sDirectoryMode: %04o\n", + "%sDirectoryMode: %04o\n" + "%sLazyUnmount: %s\n", prefix, mount_state_to_string(m->state), prefix, mount_result_to_string(m->result), prefix, m->where, @@ -686,7 +687,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { prefix, p ? strna(p->options) : "n/a", prefix, yes_no(m->from_proc_self_mountinfo), prefix, yes_no(m->from_fragment), - prefix, m->directory_mode); + prefix, m->directory_mode, + prefix, yes_no(m->lazy_unmount)); if (m->control_pid > 0) fprintf(f, @@ -846,6 +848,8 @@ static void mount_enter_unmounting(Mount *m) { m->control_command = m->exec_command + MOUNT_EXEC_UNMOUNT; r = exec_command_set(m->control_command, UMOUNT_PATH, m->where, NULL); + if (r >= 0 && m->lazy_unmount) + r = exec_command_append(m->control_command, "-l", NULL); if (r < 0) goto fail; |