Fixed dns_search_path_eth0

Package-Manager: portage-2.0.51.22-r2

3 files changed, 226 insertions, 180 deletions

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0f2d00316379..0fce6101cdc1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 MD5 b29ee10252c38491f413f36a51c014f3 ChangeLog 58930
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 0cdd2cce1c820571f3ecdaa774559ae2 baselayout-1.12.0_pre1-r1.ebuild 18441
+MD5 d977b6d1fea2e0503d1acf41a2463bd8 baselayout-1.12.0_pre1-r1.ebuild 18441
 MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
 MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
 MD5 4e7b0fb1a5daa54e4f8de4637b447fcd baselayout-1.11.12-r4.ebuild 19260
@@ -11,7 +11,7 @@ MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 57
 MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
 MD5 2d89f41d8e2a27bb9c413ce38c5c95fb files/baselayout-1.11.12-profile.patch 1847
 MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
-MD5 7d806cb49c3f9459e8b1c7f83895339f files/baselayout-1.12.0_pre1-r1.patch 17098
+MD5 9dea6001a08f1b04bb1b4be1dd78fb98 files/baselayout-1.12.0_pre1-r1.patch 18327
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
 MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
 MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
index d71c7fd5bafb..dd21b39df97b 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild,v 1.1 2005/07/19 20:58:58 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild,v 1.2 2005/07/19 21:40:07 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -32,7 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Bring us up to SVN r1317 which fixes a fair few buglets
+	# Bring us up to SVN r1318 which fixes a fair few buglets
 	epatch "${FILESDIR}/${PN}-${PV}-r1.patch"
 
 	# Setup unicode defaults for silly unicode users
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch
index c60d59451b5d..1b568a866fca 100644
--- a/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch
+++ b/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch
@@ -1,142 +1,20 @@
-Index: init.d/keymaps
-===================================================================
---- init.d/keymaps	(.../trunk)	(revision 1296)
-+++ init.d/keymaps	(.../branches/baselayout-1_12)	(working copy)
-@@ -37 +37,5 @@
--	# New kbd support.
-+	# Turn on unicode if user wants it
-+	if [[ ${UNICODE} == "yes" ]] ; then
-+		/usr/bin/kbd_mode -u
-+	fi
-+
-@@ -56 +59,0 @@
--		/usr/bin/kbd_mode -u
-Index: ChangeLog
-===================================================================
---- ChangeLog	(.../trunk)	(revision 1296)
-+++ ChangeLog	(.../branches/baselayout-1_12)	(working copy)
-@@ -3,0 +4,22 @@
-+  19 Jul 2005; Roy Marples <uberlord@gentoo.org>:
-+
-+    ${ESSID} and ${ESSIDVAR} are now available in predown() - fixes #99106
-+
-+  18 Jul 2005; Roy Marples <uberlord@gentoo.org>:
-+
-+    Changed wpa-supplicant to wpa_supplicant when reporting that it is not
-+    installed. Fixes #99381
-+
-+    Fixed some startup problems caused by a mixture of inactive +
-+    begin_service/end_service functions.
-+
-+  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
-+
-+    Add Darwin support for start-stop-daemon, bug #82421.
-+
-+  15 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
-+
-+    Do not run depmod in modules-update if System.map is missing, bug #59188.
-+
-+* baselayout-1.12.0_pre1 (14 Jul 2005)
-+
-Index: src/start-stop-daemon.c
+Index: lib/rcscripts/net.modules.d/system
 ===================================================================
---- src/start-stop-daemon.c	(.../trunk)	(revision 1296)
-+++ src/start-stop-daemon.c	(.../branches/baselayout-1_12)	(working copy)
-@@ -30,0 +31,3 @@
-+ * Updated by Kito <kito@gentoo.org>:
-+ *   Add support for Darwin, additional patches from opendarwin.org
-+ * 	 fix for Gentoo bug 72145 from eldad@gentoo.org
-@@ -54,0 +58,2 @@
-+#elif defined(__APPLE__)
-+#  define OSDarwin
-@@ -66 +71 @@
--#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
-+#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -707 +712,2 @@
--#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
-+		return;
-+#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -710 +715,0 @@
--#endif
-@@ -711,0 +717 @@
-+#endif
-@@ -893,0 +900,17 @@
-+#if defined(OSDarwin)
-+int
-+pid_is_user(pid_t pid, uid_t uid)
-+{
-+	int mib[4];
-+	size_t size;
-+	struct kinfo_proc ki;
-+
-+	size = sizeof(ki);
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_PID;
-+	mib[3] = pid;
-+	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+	return (uid == ki.kp_eproc.e_pcred.p_ruid);
-+}
-@@ -894,0 +918,54 @@
-+static int
-+pid_is_cmd(pid_t pid, const char *name)
-+{
-+	int mib[4];
-+	size_t size;
-+	struct kinfo_proc ki;
-+	
-+	size = sizeof(ki);
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_PID;
-+	mib[3] = pid;
-+	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+	return (!strncmp(name, ki.kp_proc.p_comm, MAXCOMLEN));
-+}
-+
-+static void
-+do_procinit(void)
-+{
-+	int mib[3];
-+	size_t size;
-+	int nprocs, ret, i;
-+	struct kinfo_proc *procs = NULL, *newprocs;
-+	
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_ALL;
-+	ret = sysctl(mib, 3, NULL, &size, NULL, 0);
-+	/* Allocate enough memory for entire process table */
-+	do {
-+		size += size / 10;
-+		newprocs = realloc(procs, size);
-+		if (newprocs == NULL) {
-+			if (procs)
-+				free(procs);
-+			errx(1, "%s", "Could not reallocate memory");
-+		}
-+		procs = newprocs;
-+		ret = sysctl(mib, 3, procs, &size, NULL, 0);
-+	} while (ret >= 0 && errno == ENOMEM);
-+
-+	if (ret < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+
-+	/* Verify size of proc structure */
-+	if (size % sizeof(struct kinfo_proc) != 0)
-+		errx(1, "%s", "proc size mismatch, userland out of sync with kernel");
-+	nprocs = size / sizeof(struct kinfo_proc);
-+	for (i = 0; i < nprocs; i++) {
-+		check(procs[i].kp_proc.p_pid);
-+	}
-+}
-+#endif /* OSDarwin */
+--- lib/rcscripts/net.modules.d/system	(revision 1296)
++++ lib/rcscripts/net.modules.d/system	(working copy)
+@@ -2 +2 @@
+-# Copyright (c) 2004-2005 Gentoo Foundation
++# Copyright (c) 2005 Gentoo Foundation
+@@ -38 +38 @@
+-    echo "dns_servers_$1 dns_domain_$1 dns_search_domains_$1 ntp_servers_$1 nis_domain_$1 nis_servers_$1"
++    echo "dns_servers_$1 dns_domain_$1 dns_search_path_$1 ntp_servers_$1 nis_domain_$1 nis_servers_$1"
+@@ -60 +60 @@
+-    eval x=\"\$\{dns_search_domains_${ifvar}\}\"
++    eval x=\"\$\{dns_search_path_${ifvar}\}\"
 Index: lib/rcscripts/net.modules.d/pump
 ===================================================================
---- lib/rcscripts/net.modules.d/pump	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/pump	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/pump	(revision 1296)
++++ lib/rcscripts/net.modules.d/pump	(working copy)
 @@ -79 +79 @@
 -    pump --release --keep-up --interface "${iface}"
 +    pump --release --interface "${iface}"
@@ -155,8 +33,8 @@ Index: lib/rcscripts/net.modules.d/pump
 +  
 Index: lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper
 ===================================================================
---- lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(revision 1296)
++++ lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(working copy)
 @@ -10,2 +9,0 @@
 -service="net.${interface}"
 -
@@ -193,8 +71,8 @@ Index: lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper
 +
 Index: lib/rcscripts/net.modules.d/helpers.d/dhcp-state
 ===================================================================
---- lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(revision 1296)
++++ lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(working copy)
 @@ -2 +2 @@
 -# Copyright (c) 2004-2005 Gentoo Foundation
 +# Copyright (c) 2005 Gentoo Foundation
@@ -248,24 +126,17 @@ Index: lib/rcscripts/net.modules.d/helpers.d/dhcp-state
 -
 -[[ ${RC_AUTO_INTERFACE} == "yes" ]] && interface=$( select_best_interface )
 -apply_state "${interface}"
-Index: lib/rcscripts/net.modules.d/system
-===================================================================
---- lib/rcscripts/net.modules.d/system	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/system	(.../branches/baselayout-1_12)	(working copy)
-@@ -2 +2 @@
--# Copyright (c) 2004-2005 Gentoo Foundation
-+# Copyright (c) 2005 Gentoo Foundation
 Index: lib/rcscripts/net.modules.d/dhcpcd
 ===================================================================
---- lib/rcscripts/net.modules.d/dhcpcd	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/dhcpcd	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/dhcpcd	(revision 1296)
++++ lib/rcscripts/net.modules.d/dhcpcd	(working copy)
 @@ -147,0 +148,2 @@
 +    [[ ! -d "${statedir}/${iface}" ]] && mkdir -p "${statedir}/${iface}"
 +    
 Index: lib/rcscripts/net.modules.d/wpa_supplicant
 ===================================================================
---- lib/rcscripts/net.modules.d/wpa_supplicant	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/wpa_supplicant	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/wpa_supplicant	(revision 1296)
++++ lib/rcscripts/net.modules.d/wpa_supplicant	(working copy)
 @@ -39 +39 @@
 -	${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa-supplicant"
 +	${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa_supplicant"
@@ -301,8 +172,8 @@ Index: lib/rcscripts/net.modules.d/wpa_supplicant
 -
 Index: lib/rcscripts/net.modules.d/iwconfig
 ===================================================================
---- lib/rcscripts/net.modules.d/iwconfig	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/iwconfig	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/iwconfig	(revision 1296)
++++ lib/rcscripts/net.modules.d/iwconfig	(working copy)
 @@ -906,10 +905,0 @@
 -
 -# bool iwconfig_pre_stop(char *iface)
@@ -316,8 +187,8 @@ Index: lib/rcscripts/net.modules.d/iwconfig
 -}
 Index: lib/rcscripts/net.modules.d/macnet
 ===================================================================
---- lib/rcscripts/net.modules.d/macnet	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/macnet	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/macnet	(revision 1296)
++++ lib/rcscripts/net.modules.d/macnet	(working copy)
 @@ -2 +2 @@
 -# Copyright (c) 2004-2005 Gentoo Foundation
 +# Copyright (c) 2005 Gentoo Foundation
@@ -328,8 +199,8 @@ Index: lib/rcscripts/net.modules.d/macnet
 +
 Index: lib/rcscripts/net.modules.d/rename
 ===================================================================
---- lib/rcscripts/net.modules.d/rename	(.../trunk)	(revision 1296)
-+++ lib/rcscripts/net.modules.d/rename	(.../branches/baselayout-1_12)	(working copy)
+--- lib/rcscripts/net.modules.d/rename	(revision 1296)
++++ lib/rcscripts/net.modules.d/rename	(working copy)
 @@ -2 +2 @@
 -# Copyright (c) 2004-2005 Gentoo Foundation
 +# Copyright (c) 2005 Gentoo Foundation
@@ -364,20 +235,17 @@ Index: lib/rcscripts/net.modules.d/rename
 +	fi
 +    fi
 +    
-Index: init.d/net.lo
+Index: etc/conf.d/wireless.example
 ===================================================================
---- init.d/net.lo	(.../trunk)	(revision 1296)
-+++ init.d/net.lo	(.../branches/baselayout-1_12)	(working copy)
-@@ -785,0 +786,5 @@
-+    # Load our ESSID variable so users can use it in predown() instead
-+    # of having to write code.
-+    local ESSID=$( get_options "ESSID" ) ESSIDVAR
-+    [[ -n ${ESSID} ]] && ESSIDVAR=$( bash_variable "${ESSID}" )
-+
+--- etc/conf.d/wireless.example	(revision 1296)
++++ etc/conf.d/wireless.example	(working copy)
+@@ -172 +172 @@
+-#dns_search_domains_ESSID="search.this.domain search.that.domain"
++#dns_search_path_ESSID="search.this.domain search.that.domain"
 Index: etc/conf.d/net.example
 ===================================================================
---- etc/conf.d/net.example	(.../trunk)	(revision 1296)
-+++ etc/conf.d/net.example	(.../branches/baselayout-1_12)	(working copy)
+--- etc/conf.d/net.example	(revision 1296)
++++ etc/conf.d/net.example	(working copy)
 @@ -188,3 +188,3 @@
 -#nameservers_ESSID=( "192.168.0.1" "192.168.0.2" )
 -#domain_ESSID="some.domain"
@@ -395,10 +263,188 @@ Index: etc/conf.d/net.example
 @@ -437 +436 @@
 -# dns_search_domains_eth0="this.domain that.domain"
 +# dns_search_path_eth0="this.domain that.domain"
+Index: init.d/net.lo
+===================================================================
+--- init.d/net.lo	(revision 1296)
++++ init.d/net.lo	(working copy)
+@@ -785,0 +786,5 @@
++    # Load our ESSID variable so users can use it in predown() instead
++    # of having to write code.
++    local ESSID=$( get_options "ESSID" ) ESSIDVAR
++    [[ -n ${ESSID} ]] && ESSIDVAR=$( bash_variable "${ESSID}" )
++
+Index: init.d/modules
+===================================================================
+--- init.d/modules	(revision 1296)
++++ init.d/modules	(working copy)
+@@ -79,7 +78,0 @@
+-	# Here we should fail, as a modular kernel do need
+-	# depmod command ...
+-	if [[ ! -x /sbin/depmod ]]; then
+-		eerror "ERROR:  system is missing /sbin/depmod !"
+-		return 1
+-	fi
+-
+@@ -88,2 +81,3 @@
+-	if [[ -z "${CDBOOT}" ]] && [[ $(get_KV) -lt $(KV_to_int '2.5.48') || \
+-	     -x /sbin/modprobe.old ]] && [[ ! -e /etc/modules.conf ]] ; then
++	if [[ -z "${CDBOOT}" ]] && [[ ! -e /etc/modules.conf ]] && \
++	   [[ $(get_KV) -lt $(KV_to_int '2.5.48') || -x /sbin/modprobe.old ]]
++	then
+@@ -97,2 +91,3 @@
+-	if [[ -z "${CDBOOT}" ]] && [[ -f /etc/modules.conf || \
+-	      $(get_KV) -ge $(KV_to_int '2.5.48') ]]; then
++	if [[ -z "${CDBOOT}" ]] && \
++	   [[ -f /etc/modules.conf || $(get_KV) -ge $(KV_to_int '2.5.48') ]]
++	then
+@@ -120 +115 @@
+-	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \*  &>/dev/null
++	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \* &>/dev/null
+Index: init.d/keymaps
+===================================================================
+--- init.d/keymaps	(revision 1296)
++++ init.d/keymaps	(working copy)
+@@ -37 +37,5 @@
+-	# New kbd support.
++	# Turn on unicode if user wants it
++	if [[ ${UNICODE} == "yes" ]] ; then
++		/usr/bin/kbd_mode -u
++	fi
++
+@@ -56 +59,0 @@
+-		/usr/bin/kbd_mode -u
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(revision 1296)
++++ ChangeLog	(working copy)
+@@ -3,0 +4,28 @@
++  19 Jul 2005; Roy Marples <uberlord@gentoo.org>:
++
++    ${ESSID} and ${ESSIDVAR} are now available in predown() - fixes #99106
++
++  18 Jul 2005; Roy Marples <uberlord@gentoo.org>:
++
++    Changed wpa-supplicant to wpa_supplicant when reporting that it is not
++    installed. Fixes #99381
++
++    Fixed some startup problems caused by a mixture of inactive +
++    begin_service/end_service functions.
++
++  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
++
++    Add Darwin support for start-stop-daemon, bug #82421.
++
++  15 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
++
++    Do not run depmod in modules-update if System.map is missing, bug #59188.
++
++  14 Jul 2005; Mike Frysinger <vapier@gentoo.org>:
++
++    Remove pointless check of depmod existence in modules init.d since the 
++    modules-update script checks for it.
++
++    Run kbd_mode earlier for unicode users so initial loadkeys doesn't 
++    trigger a warning #94048 by Eugene Pavlovsky.
++
+Index: src/start-stop-daemon.c
+===================================================================
+--- src/start-stop-daemon.c	(revision 1296)
++++ src/start-stop-daemon.c	(working copy)
+@@ -30,0 +31,3 @@
++ * Updated by Kito <kito@gentoo.org>:
++ *   Add support for Darwin, additional patches from opendarwin.org
++ * 	 fix for Gentoo bug 72145 from eldad@gentoo.org
+@@ -54,0 +58,2 @@
++#elif defined(__APPLE__)
++#  define OSDarwin
+@@ -66 +71 @@
+-#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
++#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
+@@ -707 +712,2 @@
+-#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
++		return;
++#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
+@@ -710 +715,0 @@
+-#endif
+@@ -711,0 +717 @@
++#endif
+@@ -893,0 +900,17 @@
++#if defined(OSDarwin)
++int
++pid_is_user(pid_t pid, uid_t uid)
++{
++	int mib[4];
++	size_t size;
++	struct kinfo_proc ki;
++
++	size = sizeof(ki);
++	mib[0] = CTL_KERN;
++	mib[1] = KERN_PROC;
++	mib[2] = KERN_PROC_PID;
++	mib[3] = pid;
++	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
++		errx(1, "%s", "Failure calling sysctl");
++	return (uid == ki.kp_eproc.e_pcred.p_ruid);
++}
+@@ -894,0 +918,54 @@
++static int
++pid_is_cmd(pid_t pid, const char *name)
++{
++	int mib[4];
++	size_t size;
++	struct kinfo_proc ki;
++	
++	size = sizeof(ki);
++	mib[0] = CTL_KERN;
++	mib[1] = KERN_PROC;
++	mib[2] = KERN_PROC_PID;
++	mib[3] = pid;
++	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
++		errx(1, "%s", "Failure calling sysctl");
++	return (!strncmp(name, ki.kp_proc.p_comm, MAXCOMLEN));
++}
++
++static void
++do_procinit(void)
++{
++	int mib[3];
++	size_t size;
++	int nprocs, ret, i;
++	struct kinfo_proc *procs = NULL, *newprocs;
++	
++	mib[0] = CTL_KERN;
++	mib[1] = KERN_PROC;
++	mib[2] = KERN_PROC_ALL;
++	ret = sysctl(mib, 3, NULL, &size, NULL, 0);
++	/* Allocate enough memory for entire process table */
++	do {
++		size += size / 10;
++		newprocs = realloc(procs, size);
++		if (newprocs == NULL) {
++			if (procs)
++				free(procs);
++			errx(1, "%s", "Could not reallocate memory");
++		}
++		procs = newprocs;
++		ret = sysctl(mib, 3, procs, &size, NULL, 0);
++	} while (ret >= 0 && errno == ENOMEM);
++
++	if (ret < 0)
++		errx(1, "%s", "Failure calling sysctl");
++
++	/* Verify size of proc structure */
++	if (size % sizeof(struct kinfo_proc) != 0)
++		errx(1, "%s", "proc size mismatch, userland out of sync with kernel");
++	nprocs = size / sizeof(struct kinfo_proc);
++	for (i = 0; i < nprocs; i++) {
++		check(procs[i].kp_proc.p_pid);
++	}
++}
++#endif /* OSDarwin */
 Index: sbin/runscript.sh
 ===================================================================
---- sbin/runscript.sh	(.../trunk)	(revision 1296)
-+++ sbin/runscript.sh	(.../branches/baselayout-1_12)	(working copy)
+--- sbin/runscript.sh	(revision 1296)
++++ sbin/runscript.sh	(working copy)
 @@ -257 +257,6 @@
 -	if ! service_inactive "${myservice}" ; then
 +	if service_inactive "${myservice}" ; then
@@ -443,23 +489,23 @@ Index: sbin/runscript.sh
 +	end_service "${myservice}" "${retval}"
 Index: sbin/rc
 ===================================================================
---- sbin/rc	(.../trunk)	(revision 1296)
-+++ sbin/rc	(.../branches/baselayout-1_12)	(working copy)
+--- sbin/rc	(revision 1296)
++++ sbin/rc	(working copy)
 @@ -830,2 +830 @@
 -	service_started "${myservice}" || \
 -		schedule_service_startup "${myservice}"
 +	service_stopped "${myservice}" && schedule_service_startup "${myservice}"
 Index: sbin/modules-update
 ===================================================================
---- sbin/modules-update	(.../trunk)	(revision 1296)
-+++ sbin/modules-update	(.../branches/baselayout-1_12)	(working copy)
+--- sbin/modules-update	(revision 1296)
++++ sbin/modules-update	(working copy)
 @@ -233 +233 @@
 -			depmod -a ${KV}
 +			ewarn "System.map not found - unable to check symbols"
 Index: sbin/rc-services.sh
 ===================================================================
---- sbin/rc-services.sh	(.../trunk)	(revision 1296)
-+++ sbin/rc-services.sh	(.../branches/baselayout-1_12)	(working copy)
+--- sbin/rc-services.sh	(revision 1296)
++++ sbin/rc-services.sh	(working copy)
 @@ -383 +382,0 @@
 -		! service_inactive && end_service "${service}" "${retval}"
 @@ -391 +389,0 @@