From 6f381004c354e0e0e2ce5303eb7a675cd1b32c57 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 5 Mar 2013 13:54:55 +0800 Subject: [PATCH] discover: Remove {U,}MOUNT_BIN defines Use pb_system_apps instead. Signed-off-by: Jeremy Kerr Signed-off-by: Geoff Levand --- discover/device-handler.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 9589bb2..bda724c 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -20,10 +20,6 @@ #include "udev.h" #include "paths.h" -#define MOUNT_BIN "/bin/mount" - -#define UMOUNT_BIN "/bin/umount" - struct device_handler { struct discover_server *server; @@ -189,7 +185,7 @@ static int mount_device(struct discover_context *ctx) pb_log("couldn't create mount directory %s: %s\n", ctx->mount_path, strerror(errno)); - argv[0] = MOUNT_BIN; + argv[0] = pb_system_apps.mount; argv[1] = ctx->device_path; argv[2] = ctx->mount_path; argv[3] = "-o"; @@ -200,7 +196,7 @@ static int mount_device(struct discover_context *ctx) /* Retry mount without ro option. */ - argv[0] = MOUNT_BIN; + argv[0] = pb_system_apps.mount; argv[1] = ctx->device_path; argv[2] = ctx->mount_path; argv[3] = NULL; @@ -231,7 +227,8 @@ static int umount_device(struct discover_context *ctx) } if (pid == 0) { - execl(UMOUNT_BIN, UMOUNT_BIN, ctx->mount_path, NULL); + execl(pb_system_apps.umount, pb_system_apps.umount, + ctx->mount_path, NULL); exit(EXIT_FAILURE); } -- 2.39.2