From d621b0ba154a50190110a2d7bcd1adaad606585e Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 17:29:09 +0200 Subject: [PATCH 1/6] include limits.h for INT_MAX --- helpers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers.c b/helpers.c index 03ecd687..bf3a1a0a 100644 --- a/helpers.c +++ b/helpers.c @@ -1,5 +1,6 @@ #include +#include #include #include #include From c127735e2d0095da62f068ef474558e099dce7a5 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 17:40:28 +0200 Subject: [PATCH 2/6] do not create useless resolvconf and network dirs in /dev/shm --- finit-alt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/finit-alt.c b/finit-alt.c index 7ad565e7..837c0f9c 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -145,8 +145,6 @@ int main() FILE *f; char line[LINE_SIZE]; int fd; - DIR *dir; - struct dirent *d; struct sigaction sa, act; sigset_t nmask, nmask2; char username[USERNAME_SIZE] = DEFUSER; @@ -307,9 +305,6 @@ int main() /* * Network stuff */ - makepath("/dev/shm/network"); - makepath("/dev/shm/resolvconf/interface"); - if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) { while ((d = readdir(dir)) != NULL) { if (isalnum(d->d_name[0])) From efdac3fc2d1dec107d354d3f110c151e9a81e81a Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 17:44:45 +0200 Subject: [PATCH 3/6] remove useless /etc/resolvconfig/run clean, it's a symlink to /var/run which is tmpfs --- finit-alt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/finit-alt.c b/finit-alt.c index 837c0f9c..febd9ae6 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -305,18 +305,6 @@ int main() /* * Network stuff */ - if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) { - while ((d = readdir(dir)) != NULL) { - if (isalnum(d->d_name[0])) - continue; - snprintf(line, LINE_SIZE, - "/etc/resolvconf/run/interface/%s", d->d_name); - unlink(line); - } - - closedir(dir); - } - touch("/var/run/utmp"); chown("/var/run/utmp", 0, getgroup("utmp")); chmod("/var/run/utmp", 0664); From 0ab62c887167b9964d12cd3a2c514ac87fdcaaf0 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 17:48:13 +0200 Subject: [PATCH 4/6] create /var/run/resolvconf/interface --- finit-alt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/finit-alt.c b/finit-alt.c index febd9ae6..358a0d54 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -305,6 +305,8 @@ int main() /* * Network stuff */ + makepath("/var/run/resolvconf/interface"); + touch("/var/run/utmp"); chown("/var/run/utmp", 0, getgroup("utmp")); chmod("/var/run/utmp", 0664); From ca9ee99f5977428a218509d29a08ce74bb23f5d7 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 17:50:01 +0200 Subject: [PATCH 5/6] create resolv.conf symlink in /var --- finit-alt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/finit-alt.c b/finit-alt.c index 358a0d54..86bf7d1b 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -306,6 +306,7 @@ int main() * Network stuff */ makepath("/var/run/resolvconf/interface"); + symlink("../../../etc/resolv.conf", "/var/run/resolvconf/resolv.conf"); touch("/var/run/utmp"); chown("/var/run/utmp", 0, getgroup("utmp")); From 2f3404165f519648bdca1b507f0626df37cf9a30 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Jun 2008 18:35:44 +0200 Subject: [PATCH 6/6] make sure /dev/null is world-writable --- finit-alt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/finit-alt.c b/finit-alt.c index 86bf7d1b..4eda85c9 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -278,6 +278,7 @@ int main() chardev("/dev/urandom", 0666, 1, 9); chardev("/dev/ptmx", 0666, 5, 2); chardev("/dev/null", 0666, 1, 3); + chmod("/dev/null", 0666); chardev("/dev/mem", 0640, 1, 1); chardev("/dev/tty0", 0660, 4, 0); chardev("/dev/input/mice", 0660, 13, 63);