[Morphix-cvs] SF.net SVN: morphix: [2602] trunk/scripts-base/etc/init.d/morphix-start

[<ale...@us...>]

Revision: 2602
          http://morphix.svn.sourceforge.net/morphix/?rev=2602&view=rev
Author:   alextreme
Date:     2007-12-05 05:28:11 -0800 (Wed, 05 Dec 2007)

Log Message:
-----------
 * removing debug-option from unionfs-mount commands

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2007-11-26 20:28:00 UTC (rev 2601)
+++ trunk/scripts-base/etc/init.d/morphix-start	2007-12-05 13:28:11 UTC (rev 2602)
@@ -352,15 +352,20 @@
 	mkdir -p $DIR2/modules >/dev/null 2>&1
 
         if [ -x /sbin/unionctl -o -x /usr/bin/unionctl ];then
-	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT} none /mnt/main
+
+# debug is no longer a unionfs-option since unionfs-2.1.x.
+# Old mount-line:
+#	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+#
 	  unionctl /mnt/main --add --mode ro /mnt/main_ro
 	  unionctl /mnt/main --add --mode rw $DIR2/root
         else
-	  mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+	  mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT} none /mnt/main
         fi
 	eend $?
 
-	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro,debug=$DEBUGOVERLAY none /mnt/main/lib/modules
+	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro none /mnt/main/lib/modules
 
     elif [ -n "$COWLOOP" ]; then
 	ebegin "Overlaying using cowloop"
@@ -386,7 +391,7 @@
 
     else
 	  if [ -n "$UNIONFS" ]; then
-	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro,debug=$DEBUGOVERLAY none /mnt/main/dev 2>&1
+	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro none /mnt/main/dev 2>&1
 	  else
 	    mount --bind /MorphixCD/dev /mnt/main/dev
 	  fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.