From 43063ae7c2faab221c877defc1957364321a8fa2 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 5 May 2009 10:24:21 +0100
Subject: Fix compile on NetBSD and FreeBSD

---
 conf.d/Makefile         | 2 +-
 conf.d/Makefile.FreeBSD | 2 ++
 conf.d/Makefile.NetBSD  | 2 ++
 src/rc/runscript.c      | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/conf.d/Makefile b/conf.d/Makefile
index a884b46..b78baf5 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 c43a1d4..94a6e7b 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 18a52cc..b069424 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 8e6b782..cec7e01 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;
-- 
cgit v1.2.3