From 7d1038815818bcc2d867d3b144046df3ee181c1c Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Wed, 18 Jun 2008 11:34:52 -0300 Subject: [PATCH] Conditional build of /etc/resolveconf/run support Xandros actually uses it. Signed-off-by: Claudio Matsuoka --- Changelog | 2 +- finit-alt.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index c0d55c72..f1768369 100644 --- a/Changelog +++ b/Changelog @@ -3,7 +3,7 @@ - write runlevel to utmp, needed by Printerdrake (Pascal Terjan) - fix ownership of /var/run/utmp (reported by Pascal Terjan) - remove obsolete code to load AGP drivers - - remove useless (?) /etc/resolveconf/run support (blino) + - conditional build of /etc/resolveconf/run support - add support to /var/run/resolvconf in Mandriva (blino) O.4 (20080516) diff --git a/finit-alt.c b/finit-alt.c index 8a66c402..37c91cad 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -74,6 +74,7 @@ THE SOFTWARE. #define GETTY "/usr/bin/openvt /sbin/getty 38400 tty2" #define RUNPARTS "/bin/run-parts" #define TOUCH_ETC_NETWORK_RUN_IFSTATE +#define USE_ETC_RESOLVCONF_RUN #endif #ifdef DIRECTISA @@ -188,6 +189,10 @@ int main() char username[USERNAME_SIZE] = DEFUSER; char hostname[HOSTNAME_SIZE] = "eviltwin"; char cmd[CMD_SIZE]; +#ifdef USE_ETC_RESOLVCONF_RUN + DIR *dir; + struct dirent *d; +#endif #ifdef RUNLEVEL struct utmp entry; #endif @@ -339,9 +344,8 @@ int main() /* * Network stuff */ -#if 0 - /* CM: not sure if anyone actually needs this, check Xandros in Eeepc */ +#ifdef USE_ETC_RESOLVCONF_RUN makepath("/dev/shm/network"); makepath("/dev/shm/resolvconf/interface");