fix net services

svn path=/baselayout-vserver/trunk/; revision=53

4 files changed, 38 insertions, 4 deletions

diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 6c28ee0..f791f73 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
 
+  09 Oct 2005; Benedikt Boehm <hollow@gentoo.org> +net-scripts/:
+  Adding back net services
+
   07 Oct 2005; Christian Heim <phreak@gentoo.org> src/consoletype.c, ChangeLog,
   sbin/rc-update:
   Refreshing baselayout-vserver with revision 1560 from baselayout.
diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index a4abb47..e04c0b0 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -1,10 +1,40 @@
 # /etc/conf.d/rc: Global config file for the Gentoo RC System
 
+# This is the number of tty's used in most of the rc-scripts (like
+# consolefont, numlock, etc ...)
+
+RC_TTY_NUMBER=0
+
 # Set to "yes" if you want the rc system to try and start services
 # in parallel for a slight speed improvement.
 
 RC_PARALLEL_STARTUP="no"
 
+# RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service.
+# The following values are allowed:
+#  none  - The 'net' service is always considered up.
+#  no    - This basically means that at least one net.* service besides net.lo
+#          must be up.  This can be used by notebook users that have a wifi and
+#          a static nic, and only wants one up at any given time to have the
+#          'net' service seen as up.
+#  lo    - This is the same as the 'no' option, but net.lo is also counted.
+#          This should be useful to people that do not care about any specific
+#          interface being up at boot.
+#  yes   - For this ALL network interfaces MUST be up for the 'net' service to
+#          be considered up.
+
+RC_NET_STRICT_CHECKING="none"
+
+# RC_AUTO_INTERFACE allows us to try and configure your interfaces
+# automatically. This includes:
+# - link /etc/{resolv,ntp,yp}.conf to /var/lib/net-scripts
+# - calculate a metric based on what interfaces are up and type
+# - apply interface state (resolv.conf, ntp.conf, etc)
+# - merge resolv.conf and ntp.conf from active interfaces based on metric
+# otherwise we don't do the above
+
+RC_AUTO_INTERFACE="no"
+
 # Set to "yes" if you want to use gentoo init style
 # in the util-vserver configuration
 
diff --git a/sbin/functions.sh b/sbin/functions.sh
index 3838e69..d5cbf22 100755
--- a/sbin/functions.sh
+++ b/sbin/functions.sh
@@ -36,7 +36,7 @@ RC_ENDCOL="yes"
 #
 RC_TTY_NUMBER=${RC_TTY_NUMBER:-0}
 RC_PARALLEL_STARTUP=${RC_PARALLEL_STARTUP:-no}
-RC_NET_STRICT_CHECKING=${RC_NET_STRICT_CHECKING:-no}
+RC_NET_STRICT_CHECKING=${RC_NET_STRICT_CHECKING:-none}
 
 #
 # Default values for e-message indentation and dots
diff --git a/src/mount/mount.c b/src/mount/mount.c
index a5ed3c8..866bcf6 100644
--- a/src/mount/mount.c
+++ b/src/mount/mount.c
@@ -17,8 +17,9 @@
 
 int main(void)
 {
-	mkdir("/proc", 0555);
 	/* "Normal" mount uses the same flags, so should we... */
-	return mount("proc", "/proc", "proc",
-			MS_POSIXACL|MS_ACTIVE|MS_NOUSER|0xec0000, 0);
+	unsigned long flags = MS_POSIXACL|MS_ACTIVE|MS_NOUSER|0xec0000;
+	
+	mkdir("/proc", 0755);
+	return mount("none", "/proc", "proc", flags, 0);
 }