[Morphix-cvs] SF.net SVN: morphix: [2419] trunk/scripts-base

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

Revision: 2419
          http://svn.sourceforge.net/morphix/?rev=2419&view=rev
Author:   alextreme
Date:     2006-09-20 16:12:59 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
  * removing copyup, bumping

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

Modified: trunk/scripts-base/debian/changelog
===================================================================
--- trunk/scripts-base/debian/changelog	2006-09-14 22:30:57 UTC (rev 2418)
+++ trunk/scripts-base/debian/changelog	2006-09-20 23:12:59 UTC (rev 2419)
@@ -1,3 +1,9 @@
+morphix-base-scripts (0.5-60) unstable; urgency=low
+
+  * removing copyup= from unionfs-lines
+
+ -- root <ro...@al...>  Thu, 21 Sep 2006 01:08:08 +0200
+
 morphix-base-scripts (0.5-59) unstable; urgency=low
 
   * loading minimodules respects boot_option if this file exists in minimodule

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2006-09-14 22:30:57 UTC (rev 2418)
+++ trunk/scripts-base/etc/init.d/morphix-start	2006-09-20 23:12:59 UTC (rev 2419)
@@ -21,7 +21,7 @@
 # Changes for home-image creation
 # by Olivier Evalet <evaleto at programmers dot ch>
 
-MORPHIXVERSION="0.5-pre6"
+MORPHIXVERSION="0.5-pre7"
 SPLASHBIN="/static/splash"
 
 . /etc/morphix.d/color.sh
@@ -352,15 +352,15 @@
 	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},copyup=preserve,debug=$DEBUGOVERLAY none /mnt/main
+	  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},copyup=currentuser,debug=$DEBUGOVERLAY none /mnt/main
+	  mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
         fi
 	eend $?
 
-	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro,copyup=currentuser,debug=$DEBUGOVERLAY none /mnt/main/lib/modules
+	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro,debug=$DEBUGOVERLAY none /mnt/main/lib/modules
 
     elif [ -n "$COWLOOP" ]; then
 	ebegin "Overlaying using cowloop"
@@ -386,7 +386,7 @@
 
     else
 	  if [ -n "$UNIONFS" ]; then
-	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro,copyup=currentuser,debug=$DEBUGOVERLAY none /mnt/main/dev 2>&1
+	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro,debug=$DEBUGOVERLAY 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.