dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-15 20:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add credential support for mount units

Browse Source 
Add EXEC_SETUP_CREDENTIALS flag to allow using credentials with mount units.
Fixes: https://github.com/systemd/systemd/issues/23535
This commit is contained in:
davjav
2024-10-07 19:35:22 -07:00
committed by Mike Yuan
parent 219a6dbbf3
commit 6577cf1ba9
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/mount.c
View File

@@ -854,9 +854,19 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
}
}
static int mount_spawn(Mount *m, ExecCommand *c, PidRef *ret_pid) {
_cleanup_(exec_params_shallow_clear) ExecParameters exec_params = EXEC_PARAMETERS_INIT(
EXEC_APPLY_SANDBOXING|EXEC_APPLY_CHROOT|EXEC_APPLY_TTY_STDIN);
static ExecFlags mount_exec_flags(MountState state) {
ExecFlags flags = EXEC_APPLY_SANDBOXING|EXEC_APPLY_CHROOT|EXEC_APPLY_TTY_STDIN;
assert(IN_SET(state, MOUNT_MOUNTING, MOUNT_REMOUNTING, MOUNT_UNMOUNTING));
if (IN_SET(state, MOUNT_MOUNTING, MOUNT_REMOUNTING))
flags |= EXEC_SETUP_CREDENTIALS;
return flags;
}
static int mount_spawn(Mount *m, ExecCommand *c, ExecFlags flags, PidRef *ret_pid) {
_cleanup_(exec_params_shallow_clear) ExecParameters exec_params = EXEC_PARAMETERS_INIT(flags);
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
int r;
@@ -1047,7 +1057,7 @@ static void mount_enter_unmounting(Mount *m) {
mount_unwatch_control_pid(m);
r = mount_spawn(m, m->control_command, &m->control_pid);
r = mount_spawn(m, m->control_command, mount_exec_flags(MOUNT_UNMOUNTING), &m->control_pid);
if (r < 0) {
log_unit_warning_errno(UNIT(m), r, "Failed to spawn 'umount' task: %m");
goto fail;
@@ -1192,7 +1202,7 @@ static void mount_enter_mounting(Mount *m) {
mount_unwatch_control_pid(m);
r = mount_spawn(m, m->control_command, &m->control_pid);
r = mount_spawn(m, m->control_command, mount_exec_flags(MOUNT_MOUNTING), &m->control_pid);
if (r < 0) {
log_unit_warning_errno(UNIT(m), r, "Failed to spawn 'mount' task: %m");
goto fail;
@@ -1257,7 +1267,7 @@ static void mount_enter_remounting(Mount *m) {
mount_unwatch_control_pid(m);
r = mount_spawn(m, m->control_command, &m->control_pid);
r = mount_spawn(m, m->control_command, mount_exec_flags(MOUNT_REMOUNTING), &m->control_pid);
if (r < 0) {
log_unit_warning_errno(UNIT(m), r, "Failed to spawn 'remount' task: %m");
goto fail;