Bruno Randolf writes:

this patch fixes run_parts when it's called by ifupdown. 1) argv has to be a
NULL terminated char* array, not just a string. 2) run_parts now explicitly
sets the environment. this environment is populated from the
/etc/network/interfaces config file and is needed by the scripts in
/etc/network/if-pre-up.d/. when run-parts is called from the command line the
environment is taken from the current process.


Vladimir Oleynik then wrote:

You can simplify this if use:

+       bb_xasprintf(&buf[0], "/etc/network/if-%s.d", opt);
+       buf[1] = NULL;
+
+       run_parts(&buf, 2, environ);
+       free(buf[0]);

--w
vodz


git-svn-id: svn://busybox.net/trunk/busybox@7130 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 2 insertions, 2 deletions

diff --git a/libbb/run_parts.c b/libbb/run_parts.c
index 58645660b..171d93793 100644
--- a/libbb/run_parts.c
+++ b/libbb/run_parts.c
@@ -47,7 +47,7 @@ static int valid_name(const struct dirent *d)
  * test_mode = 2 means to fail siliently on missing directories
  */
 
-extern int run_parts(char **args, const unsigned char test_mode)
+extern int run_parts(char **args, const unsigned char test_mode, char **env)
 {
         struct dirent **namelist = 0;
         struct stat st;
@@ -92,7 +92,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
                                         bb_perror_msg_and_die("failed to fork");
                                 } else if (!pid) {
                                         args[0] = filename;
-                                        execv(filename, args);
+                                        execve(filename, args, env);
                                         exec_errno = errno;
                                         _exit(1);
                                 }