aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-05 10:24:21 +0100
committerRoy Marples <roy@marples.name>2009-05-05 10:24:21 +0100
commit43063ae7c2faab221c877defc1957364321a8fa2 (patch)
tree6735e254348ba13a7f7415fe6e0746808d3b7e13
parente575b33047d501d96bb42679dcd709b9c3bee265 (diff)
Fix compile on NetBSD and FreeBSD
-rw-r--r--conf.d/Makefile2
-rw-r--r--conf.d/Makefile.FreeBSD2
-rw-r--r--conf.d/Makefile.NetBSD2
-rw-r--r--src/rc/runscript.c3
4 files changed, 7 insertions, 2 deletions
diff --git a/conf.d/Makefile b/conf.d/Makefile
index a884b46b..b78baf55 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -11,4 +11,4 @@ include ${MK}/scripts.mk
network: network.in network.${OS}
cp network.in network
- [ -e network.${OS} ] && cat network.${OS} >> network
+ [ -e network.${OS} ] && cat network.${OS} >> network || true
diff --git a/conf.d/Makefile.FreeBSD b/conf.d/Makefile.FreeBSD
index c43a1d4f..94a6e7bd 100644
--- a/conf.d/Makefile.FreeBSD
+++ b/conf.d/Makefile.FreeBSD
@@ -1 +1,3 @@
CONF+= ipfw moused powerd rarpd savecore syscons
+
+network.${OS}:
diff --git a/conf.d/Makefile.NetBSD b/conf.d/Makefile.NetBSD
index 18a52cce..b0694249 100644
--- a/conf.d/Makefile.NetBSD
+++ b/conf.d/Makefile.NetBSD
@@ -1 +1,3 @@
CONF+= moused rarpd savecore
+
+network.${OS}:
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 8e6b782a..cec7e01f 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -450,7 +450,8 @@ svc_exec(const char *arg1, const char *arg2)
master_tty = -1;
}
- ret = WEXITSTATUS(rc_waitpid(service_pid));
+ ret = rc_waitpid(service_pid);
+ ret = WEXITSTATUS(ret);
if (ret != 0 && errno == ECHILD)
/* killall5 -9 could cause this */
ret = 0;