* net/net-tools:

   * DETAILS: Updated PATCHLEVEL to 2
     Removed UPDATED
   * init.d/mountnetwork.conf: Added "cifs" as a network filesystem to mount
     Added "cifs" to allowable keywords
 * smgl/init.d:
   * init.d/mountall.sh: cifs is also a network filesystem, don't mount it here
     Corrected comment to refer to mountnetwork instead of mountnfs

6 files changed, 24 insertions, 14 deletions

diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index ef7c155ad3..32ceda1c3f 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,12 +4,11 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE
      SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
-        WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
-         ENTERED=20010922
-         UPDATED=20060306
-      PATCHLEVEL=1
+      PATCHLEVEL=2
       LICENSE[0]=GPL
        BUILD_API=2
+        WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
+         ENTERED=20010922
            SHORT="Essential tools for networking."
 cat << EOF
 The Net-tools package contains the arp, hostname, ifconfig, netstat,
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 515e85b8ea..0f0a7a7cec 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,9 @@
+2006-06-09 Eric Sandall <eric@sandall.us>
+	* DETAILS: Updated PATCHLEVEL to 2
+	  Removed UPDATED
+	* init.d/mountnetwork.conf: Added "cifs" as a network filesystem to mount
+	  Added "cifs" to allowable keywords
+
 2006-03-16 Arwed v. Merkatz <v.merkatz@gmx.net>
 	* CONFIGURE, DEPENDS: disable decnet support as it's broken,
 	  fixes bug #8922
diff --git a/net/net-tools/init.d/mountnetwork.conf b/net/net-tools/init.d/mountnetwork.conf
index 582b68c729..fe114c09ab 100644
--- a/net/net-tools/init.d/mountnetwork.conf
+++ b/net/net-tools/init.d/mountnetwork.conf
@@ -1,4 +1,4 @@
 # A space separated list of network file systems that are to be mounted at
-# boot. Supported values are "nfs", "ncpfs" and "smbfs" (without the quotes).
-# The /usr hierachy may be loaded through this script.
-FILESYSTEMS="nfs ncpfs smbfs"
+# boot. Supported values are "cifs", "nfs", "ncpfs" and "smbfs" (without the
+# quotes).  The /usr hierachy may be loaded through this script.
+FILESYSTEMS="cifs nfs ncpfs smbfs"
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index d7e2ff7421..5676e3e7f0 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,11 +1,10 @@
            SPELL=init.d
          VERSION=2.2.0
-         ENTERED=20030505
-         UPDATED=20051212
       LICENSE[0]=GPL
+      PATCHLEVEL=8
        BUILD_API=2
-      PATCHLEVEL=7
         KEYWORDS="smgl"
+         ENTERED=20030505
            SHORT="This is the basic initalization system of SMGL"
 cat << EOF
 This is the basic initalization system of Sourcemage GNU/Linux.
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 79f610b525..cac916c5cb 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2006-06-09 Eric Sandall <eric@sandall.us>
+	* init.d/mountall.sh: cifs is also a network filesystem, don't mount it here
+	  Corrected comment to refer to mountnetwork instead of mountnfs
+
 2006-04-28 Jeremy Blosser <jblosser-smgl@firinn.org>
 	* UP_TRIGGERS: Make sure $INSTALL_ROOT/etc/sysconfig/facilities exists
 	  before grepping it.
@@ -17,6 +21,8 @@
 	* WIP: Removed, this is going to test.
 
 2006-03-07 Juuso Alasuutari <juuso.alasuutari@tamperelainen.org>
+	* DETAILS: Updated PATCHLEVEL to 9
+	  Removed UPDATED
 	* init.d/keymap.sh: Split include map loading into separate 
 	  scripts for kbd and console-tools due to compatibility issues 
 	  between their map sets.
@@ -40,8 +46,8 @@
 	  changes to take effect
 
 2006-02-27 David Brown <dmlb2000@gmail.com>
-        * init.d/mountall.sh: fixed recursive_rm to not fail if nothing is there
-        * DETAILS: updated patch level
+	* init.d/mountall.sh: fixed recursive_rm to not fail if nothing is there
+	* DETAILS: updated patch level
 
 2006-02-27 Jeremy Blosser <jblosser-smgl@firinn.org>
 	* init.d/files/smgl_init: Support a new WANTS variant of NEEDS syntax
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 2c6c40078b..5497019c3b 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -75,8 +75,8 @@ start()
 
   echo "Mounting local filesystems..."
 # Fixed so as to not mount networked filesystems yet (no networking)
-# mountnfs.sh will take care of this.
-  mount    -a  -t  nosmbfs,nonfs,noncpfs,notmpfs
+# mountnetwork.sh will take care of this.
+  mount    -a  -t  nocifs,noncpfs,nonfs,nosmbfs,notmpfs
 # mount tmpfs mounts after physical partitions they might mount to (bug 3597)
   mount    -a  -t tmpfs
   evaluate_retval