[SCM] live-startscripts branch, master, updated. d41e851a56d3d63c0fdf78adc7bc887fc827267c

[Richard Nelson]

The following commit has been merged in the master branch:
commit d41e851a56d3d63c0fdf78adc7bc887fc827267c
Author: Richard Nelson <unixabg at gmail.com>
Date:   Sun Dec 6 09:27:30 2009 -0600

    Change source composition path on rsync and ln commands.

diff --git a/initscripts/live-vmware-player b/initscripts/live-vmware-player
index dd83833..fb0e6d7 100755
--- a/initscripts/live-vmware-player
+++ b/initscripts/live-vmware-player
@@ -205,10 +205,10 @@ EOF
 
 					echo RELEASE=\"${CRELEASE}\" > /vmware/local-release
 					echo "Rsyncing in some stuff to /vmware." >> /var/log/live-vmware-player.log
-					rsync --exclude ${VMXNAME}-????.vmdk -r ${IMAGEPATH}/ /vmware/
+					rsync --exclude ${VMXNAME}-????.vmdk -r ${IMAGEPATH}/${VMXNAME}/ /vmware/
 
 					# Link in the big chunks.
-					ln -s ${IMAGEPATH}/${VMXNAME}-????.vmdk /vmware
+					ln -s ${IMAGEPATH}/${VMXNAME}/${VMXNAME}-????.vmdk /vmware
 				else
 					echo "Version match no scratch action taken!" >> /var/log/live-vmware-player.log
 					echo "Removing any temp old lock files!" >> /var/log/live-vmware-player.log
@@ -218,10 +218,10 @@ EOF
 				echo "Looks like an initial release setup for version ${CRELEASE}." >> /var/log/live-vmware-player.log
 				echo RELEASE=\"${CRELEASE}\" > /vmware/local-release
 				echo "Rsyncing in some stuff to /vmware." >> /var/log/live-vmware-player.log
-				rsync --exclude ${VMXNAME}-????.vmdk -r ${IMAGEPATH}/ /vmware/
+				rsync --exclude ${VMXNAME}-????.vmdk -r ${IMAGEPATH}/${VMXNAME}/ /vmware/
 
 				# Link in the big chunks.
-				ln -s ${IMAGEPATH}/${VMXNAME}-????.vmdk /vmware
+				ln -s ${IMAGEPATH}/${VMXNAME}/${VMXNAME}-????.vmdk /vmware
 			fi
 
 			echo "Setting the permissions on the /vmware folder." >> /var/log/live-vmware-player.log

-- 
live-startscripts