diff options
| author | lcapriotti <lcapriotti@svn> | 2010-09-22 10:16:43 +0000 |
|---|---|---|
| committer | lcapriotti <lcapriotti@svn> | 2010-09-22 10:16:43 +0000 |
| commit | e3b020dca61f788468dad9fda7a05e5613b26e1b (patch) | |
| tree | 0584d1ddb1bd8ed24bcdeae78d1a760e8d41ddf9 /tools/XBMCLive | |
| parent | 18a118854f47ad9658d8b48ca468e47fe7475390 (diff) | |
merge from trunk: r34056
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@34057 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/XBMCLive')
| -rwxr-xr-x | tools/XBMCLive/diskmounter | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/XBMCLive/diskmounter b/tools/XBMCLive/diskmounter index ae49062168..a44e7b7275 100755 --- a/tools/XBMCLive/diskmounter +++ b/tools/XBMCLive/diskmounter @@ -48,7 +48,7 @@ for drive in $drivesntfs; do if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -76,7 +76,7 @@ for drive in $drivesfat; do uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -104,7 +104,7 @@ for drive in $driveshfs; do if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -131,7 +131,7 @@ for drive in $drivesext; do if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi |