diff --git a/src/finit.c b/src/finit.c index 8550a6ee..c9b9abf6 100644 --- a/src/finit.c +++ b/src/finit.c @@ -155,36 +155,39 @@ static void networking(void) return; } - /* Debian/Ubuntu/Busybox interfaces file */ - fp = fopen("/etc/network/interfaces", "r"); - if (fp) { - int i = 0; - char buf[160]; + /* Debian/Ubuntu/Busybox/RH/Suse */ + if (fexist("/sbin/ifup")) { + /* interfaces file */ + fp = fopen("/etc/network/interfaces", "r"); + if (fp) { + int i = 0; + char buf[160]; - /* Bring up all 'auto' interfaces */ - while (fgets(buf, sizeof(buf), fp)) { - char cmd[80]; - char *line, *ifname = NULL; + /* Bring up all 'auto' interfaces */ + while (fgets(buf, sizeof(buf), fp)) { + char cmd[80]; + char *line, *ifname = NULL; - chomp(buf); - line = strip_line(buf); + chomp(buf); + line = strip_line(buf); - if (!strncmp(line, "auto", 4)) - ifname = &line[5]; - if (!strncmp(line, "allow-hotplug", 13)) - ifname = &line[14]; + if (!strncmp(line, "auto", 4)) + ifname = &line[5]; + if (!strncmp(line, "allow-hotplug", 13)) + ifname = &line[14]; - if (!ifname) - continue; + if (!ifname) + continue; - snprintf(cmd, 80, "/sbin/ifup %s", ifname); - run_interactive(cmd, "Bringing up interface %s", ifname); - i++; + snprintf(cmd, 80, "/sbin/ifup %s", ifname); + run_interactive(cmd, "Bringing up interface %s", ifname); + i++; + } + + fclose(fp); + if (i) + return; } - - fclose(fp); - if (i) - return; } /* Fall back to bring up at least loopback */ @@ -251,6 +254,11 @@ int main(int argc, char* argv[]) uev_init(&loop); ctx = &loop; + /* + * Set the PATH early to something sane + */ + setenv("PATH", _PATH_STDPATH, 1); + /* * Mount base file system, kernel is assumed to run devtmpfs for /dev */ @@ -340,9 +348,6 @@ int main(int argc, char* argv[]) /* Set hostname as soon as possible, for syslog et al. */ set_hostname(&hostname); - /* Set default PATH, for uid 0 */ - setenv("PATH", _PATH_STDPATH, 1); - /* * Mount filesystems */ diff --git a/src/finit.h b/src/finit.h index 4e01c21d..56dc4507 100644 --- a/src/finit.h +++ b/src/finit.h @@ -36,6 +36,16 @@ #include #include +/* just in case */ +#ifndef _PATH_STDPATH +#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" +#endif + +#ifndef _PATH_VARRUN +#define _PATH_VARRUN "/var/run/" +#endif + + #define CMD_SIZE 256 #define LINE_SIZE 1024 #define BUF_SIZE 4096