From 51c31ae1c5f78d236d20c944d1750265e798c11a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 15 Apr 2012 00:25:40 +0200 Subject: automount: Pass automount pass as environment variable This makes it possible to pass a command sequence to the automount command instead of only a script (a command sequence would get confused by the additional argument) Signed-off-by: Sascha Hauer --- fs/fs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'fs') diff --git a/fs/fs.c b/fs/fs.c index 24ef25827a..64997cc8d2 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include void *read_file(const char *filename, size_t *size) { @@ -289,7 +291,6 @@ static void automount_mount(const char *path, int instat) int ret; list_for_each_entry(am, &automount_list, list) { - char *cmd; int len_path = strlen(path); int len_am_path = strlen(am->path); @@ -312,9 +313,10 @@ static void automount_mount(const char *path, int instat) if (*(path + len_am_path) != 0 && *(path + len_am_path) != '/') continue; - cmd = asprintf("%s %s", am->cmd, am->path); - ret = run_command(cmd, 0); - free(cmd); + setenv("automount_path", am->path); + export("automount_path"); + ret = run_command(am->cmd, 0); + setenv("automount_path", NULL); if (ret) printf("running automount command '%s' failed\n", @@ -325,6 +327,9 @@ static void automount_mount(const char *path, int instat) return; } } + +BAREBOX_MAGICVAR(automount_path, "mountpath passed to automount scripts"); + #else static void automount_mount(const char *path, int instat) { -- cgit v1.2.3