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

[Richard Nelson]

The following commit has been merged in the master branch:
commit 5573a2d18ae9e995f530546fb39ea296c7b5a9ce
Author: Richard Nelson <unixabg at gmail.com>
Date:   Mon Oct 26 16:30:50 2009 -0500

    Added test to see if a partition label of vmware exists and if so use that partition for vmware scratch area.

diff --git a/initscripts/live-vmware-player b/initscripts/live-vmware-player
index 18bb5f6..69df275 100755
--- a/initscripts/live-vmware-player
+++ b/initscripts/live-vmware-player
@@ -132,7 +132,12 @@ EOF
 			mkdir -p /vmware
 
 			echo "Checking for a local scratch device." >> /var/log/live-vmware-player.log
-			MOUNTDEV="$(fdisk -l | grep a1 | awk '{print $1}')"
+			# Try to find a partition labeled vmware and if not then try first partition on first drive of the unit.
+			MOUNTDEV="$(blkid | grep vmware | awk -F: '{print $1}')"
+			if [ -z "${MOUNTDEV}" ]
+			then
+				MOUNTDEV="$(fdisk -l | grep a1 | awk '{print $1}')"
+			fi
 			echo "Potential scratch devices of: ${MOUNTDEV}" >> /var/log/live-vmware-player.log
 
 			########################################################################

-- 
live-startscripts