aboutsummaryrefslogtreecommitdiff
path: root/tools/XBMCLive/installXBMC
diff options
context:
space:
mode:
Diffstat (limited to 'tools/XBMCLive/installXBMC')
-rwxr-xr-xtools/XBMCLive/installXBMC8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/XBMCLive/installXBMC b/tools/XBMCLive/installXBMC
index f14fe3a127..12791cd7b7 100755
--- a/tools/XBMCLive/installXBMC
+++ b/tools/XBMCLive/installXBMC
@@ -92,7 +92,11 @@ def findBootVolume(rootFS, lookForRootFS):
rootPartition, retCode = runSilent('blkid | grep "' + anUUID + '" | cut -d ":" -f 1')
return rootPartition
- driveList = ["sr0","sr1","sr2","sr3","sda","sdb","sdc","sdd","sde","sdf","sdg"]
+ outString, retCode = runSilent('mount | grep iso9660')
+ if len(outString):
+ driveList = ["sr0","sr1","sr2","sr3"]
+ else:
+ driveList = ["sda","sdb","sdc","sdd","sde","sdf","sdg"]
# Find the drive we booted from
found = False
@@ -102,7 +106,7 @@ def findBootVolume(rootFS, lookForRootFS):
if os.path.exists(device):
if os.path.exists("/sys/block/" + deviceNode + "/removable"):
if isRemovableDisk(device):
- if device.startswith("sd"):
+ if deviceNode.startswith("sd"):
device = device + "1"
mountDevice(device, "", gBootPartMountPoint)
else: