[Morphix-cvs] SF.net SVN: morphix:[2637] trunk/scripts-base/miniroot/linuxrc-scripts/ linuxrc

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

Revision: 2637
          http://morphix.svn.sourceforge.net/morphix/?rev=2637&view=rev
Author:   alextreme
Date:     2009-01-15 23:20:05 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
 * This might fix copy-to-memory.
 * It might not.

Modified Paths:
--------------
    trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2008-06-20 13:54:41 UTC (rev 2636)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2009-01-15 23:20:05 UTC (rev 2637)
@@ -453,18 +453,18 @@
     cat /MorphixCD/etc/ld.so.cache > /etc/ld.so.cache 
 
     echo " * Copying /cdrom to RamDisk/Harddisk, please be patient..." # Hey, we could use some fancy dialog skript here :-)) 
-    /bin/mkdir -p /cdrom2/$DERIVATE
+    /bin/mkdir -p /cdrom2/$DERIVATE-ctm
     if [ -n "$COPYTORAM" ]
 	then
 	/bin/mount -t tmpfs -o size=800M /dev/shm /cdrom2
-	/bin/cp -a /cdrom/* /cdrom2/$DERIVATE # Copy everything to /cdrom2; yes we need more things then only the KNOPPIX/Morphix image, we don't want to produce problems we hadn't before, do we ? (note from Alex: this also copies any modules on the cdrom. Gotta love this patch :)
+	/bin/cp -a /cdrom/* /cdrom2/$DERIVATE-ctm # Copy everything to /cdrom2; yes we need more things then only the KNOPPIX/Morphix image, we don't want to produce problems we hadn't before, do we ? (note from Alex: this also copies any modules on the cdrom. Gotta love this patch :)
     else
 	COPYTOHD=$(echo $CMDLINE | /usr/bin/tr ' ' '\n' | /bin/sed -n '/tohd=/s/.*=//p' | /usr/bin/tail -1)
 	echo -n "${CRE} ${GREEN}* Copying ${DERIVATE} CDROM to ${MAGENTA}/dev/$COPYTOHD${GREEN}... Please be patient. ${NORMAL}"
 	if mountit /dev/$COPYTOHD /cdrom2 >/dev/null
 	    then
-	    /bin/mkdir /cdrom2/$DERIVATE
-	    /bin/cp -a /cdrom/* /cdrom2/$DERIVATE
+	    /bin/mkdir /cdrom2/$DERIVATE-ctm
+	    /bin/cp -a /cdrom/* /cdrom2/$DERIVATE-ctm
 	   #/bin/mount -o remount,ro /dev/$COPYTOHD /cdrom2
 	else
 	    echo "${CRE} ${RED}* Copying ${DERIVATE} CDROM failed. /dev/$COPYTOHD is not mountable. ${NORMAL}"
@@ -475,13 +475,13 @@
     [ -z "$USE_SQUASH" ] && $RMMOD cloop # release CD
     echo "0" > /proc/sys/kernel/printk # Debugging
     umount /cdrom  # unmount CD
-    if test -f /cdrom2/$DERIVATE/base/morphix; then
+    if test -f /cdrom2/$DERIVATE-ctm/base/morphix; then
 	if [ -z "$USE_SQUASH" ];then 
 	    $INSMOD -f /modules/cloop$KEXT 2> /dev/null
-	    $LOSETUP /dev/cloop /cdrom2/$DERIVATE/base/morphix
+	    $LOSETUP /dev/cloop /cdrom2/$DERIVATE-ctm/base/morphix
 	    mountit /dev/cloop /MorphixCD "-o ro" || FOUND_MORPHIX="" 2> /dev/null
 	else
-	    mount -t squashfs -o "loop,ro" /cdrom2/$DERIVATE/base/morphix /MorphixCD  || FOUND_MORPHIX="" 2> /dev/null
+	    mount -t squashfs -o "loop,ro" /cdrom2/$DERIVATE-ctm/base/morphix /MorphixCD  || FOUND_MORPHIX="" 2> /dev/null
 	fi
     else
       FOUND_MORPHIX=""


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