diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-05-13 14:43:04 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-13 15:48:28 +0200 |
| commit | f00929ad622c978f8ad83590a15a765b4beecac9 (patch) | |
| tree | e5f05492f4065582e1e3fa1d079452d8aa0bd470 /src/core | |
| parent | 7ba2711d3fd283c389db2a1e7b9598ba9f0dac0c (diff) | |
Default to /usr/bin/u?mount, configurable, rather than hard-coded /bin/u?mount.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.h | 2 | ||||
| -rw-r--r-- | src/core/mount.c | 12 | ||||
| -rw-r--r-- | src/core/mount.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/core/execute.h b/src/core/execute.h index a0908e0c3d..f5d5c1dee7 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -165,7 +165,7 @@ struct ExecContext { /* This is not exposed to the user but available * internally. We need it to make sure that whenever we spawn - * /bin/mount it is run in the same process group as us so + * /usr/bin/mount it is run in the same process group as us so * that the autofs logic detects that it belongs to us and we * don't enter a trigger loop. */ bool same_pgrp; diff --git a/src/core/mount.c b/src/core/mount.c index 8853311bd7..8ef3d1755d 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -135,8 +135,8 @@ static void mount_init(Unit *u) { m->exec_context.std_error = u->manager->default_std_error; } - /* We need to make sure that /bin/mount is always called in - * the same process group as us, so that the autofs kernel + /* We need to make sure that /usr/bin/mount is always called + * in the same process group as us, so that the autofs kernel * side doesn't send us another mount request while we are * already trying to comply its last one. */ m->exec_context.same_pgrp = true; @@ -833,7 +833,7 @@ static void mount_enter_unmounting(Mount *m) { m->control_command_id = MOUNT_EXEC_UNMOUNT; m->control_command = m->exec_command + MOUNT_EXEC_UNMOUNT; - r = exec_command_set(m->control_command, "/bin/umount", m->where, NULL); + r = exec_command_set(m->control_command, UMOUNT_PATH, m->where, NULL); if (r >= 0 && UNIT(m)->manager->running_as == MANAGER_SYSTEM) r = exec_command_append(m->control_command, "-n", NULL); if (r < 0) @@ -884,7 +884,7 @@ static void mount_enter_mounting(Mount *m) { if (r < 0) goto fail; - r = exec_command_set(m->control_command, "/bin/mount", + r = exec_command_set(m->control_command, MOUNT_PATH, m->parameters_fragment.what, m->where, NULL); if (r >= 0 && UNIT(m)->manager->running_as == MANAGER_SYSTEM) r = exec_command_append(m->control_command, "-n", NULL); @@ -931,7 +931,7 @@ static void mount_enter_remounting(Mount *m) { else o = "remount"; - r = exec_command_set(m->control_command, "/bin/mount", + r = exec_command_set(m->control_command, MOUNT_PATH, m->parameters_fragment.what, m->where, "-o", o, NULL); if (r >= 0 && UNIT(m)->manager->running_as == MANAGER_SYSTEM) @@ -1582,7 +1582,7 @@ static int mount_enumerate(Manager *m) { /* Dispatch this before we dispatch SIGCHLD, so that * we always get the events from /proc/self/mountinfo - * before the SIGCHLD of /bin/mount. */ + * before the SIGCHLD of /usr/bin/mount. */ r = sd_event_source_set_priority(m->mount_event_source, -10); if (r < 0) goto fail; diff --git a/src/core/mount.h b/src/core/mount.h index a01e6da194..280ea0d638 100644 --- a/src/core/mount.h +++ b/src/core/mount.h @@ -28,8 +28,8 @@ typedef struct Mount Mount; typedef enum MountState { MOUNT_DEAD, - MOUNT_MOUNTING, /* /bin/mount is running, but the mount is not done yet. */ - MOUNT_MOUNTING_DONE, /* /bin/mount is running, and the mount is done. */ + MOUNT_MOUNTING, /* /usr/bin/mount is running, but the mount is not done yet. */ + MOUNT_MOUNTING_DONE, /* /usr/bin/mount is running, and the mount is done. */ MOUNT_MOUNTED, MOUNT_REMOUNTING, MOUNT_UNMOUNTING, |