emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile on NetBSD and FreeBSD

Browse Source
This commit is contained in:
Roy Marples
2009-05-05 10:24:21 +01:00
parent e575b33047
commit 43063ae7c2
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/Makefile
View File

@@ -11,4 +11,4 @@ include ${MK}/scripts.mk
network: network.in network.${OS} network: network.in network.${OS}
cp network.in network cp network.in network
[ -e network.${OS} ] && cat network.${OS} >> network [ -e network.${OS} ] && cat network.${OS} >> network || true

2
conf.d/Makefile.FreeBSD
View File

@@ -1 +1,3 @@
CONF+= ipfw moused powerd rarpd savecore syscons CONF+= ipfw moused powerd rarpd savecore syscons
network.${OS}:

2
conf.d/Makefile.NetBSD
View File

@@ -1 +1,3 @@
CONF+= moused rarpd savecore CONF+= moused rarpd savecore
network.${OS}:

3
src/rc/runscript.c
View File

@@ -450,7 +450,8 @@ svc_exec(const char *arg1, const char *arg2)
master_tty = -1; master_tty = -1;
} }
ret = WEXITSTATUS(rc_waitpid(service_pid)); ret = rc_waitpid(service_pid);
ret = WEXITSTATUS(ret);
if (ret != 0 && errno == ECHILD) if (ret != 0 && errno == ECHILD)
/* killall5 -9 could cause this */ /* killall5 -9 could cause this */
ret = 0; ret = 0;