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

Merge some of reb's OpenBSD fixes in

Browse Source
This commit is contained in:
Roy Marples
2007-07-25 20:58:23 +00:00
parent af2d9995d7
commit 075e80b358
7 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mountinfo.c
View File

@ -7,8 +7,11 @@
#define APPLET "mountinfo"
#if defined(__DragonFly__) || defined(__FreeBSD__) || \
defined(__NetBSD__) || defined(__OpenBSD__)
#define BSD
#include <sys/types.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
@ -30,7 +33,7 @@
#include "strlist.h"
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
#ifdef BSD
static char **find_mounts (regex_t *node_regex, regex_t *skip_node_regex,
regex_t *fstype_regex, regex_t *skip_fstype_regex,
char **mounts, bool node, bool fstype)

2
src/rc.c
View File

@ -990,6 +990,7 @@ int main (int argc, char **argv)
strcmp (runlevel, RC_LEVEL_SYSINIT) == 0) &&
rc_is_env ("RC_COLDPLUG", "yes"))
{
#if defined(__DragonFly__) || defined(__FreeBSD__)
/* The net interfaces are easy - they're all in net /dev/net :) */
start_services = rc_ls_dir (NULL, "/dev/net", 0);
STRLIST_FOREACH (start_services, service, i) {
@ -1001,6 +1002,7 @@ int main (int argc, char **argv)
CHAR_FREE (tmp);
}
rc_strlist_free (start_services);
#endif
/* The mice are a little more tricky.
If we coldplug anything else, we'll probably do it here. */