diff options
| author | lcapriotti <lcapriotti@svn> | 2009-10-07 10:43:03 +0000 |
|---|---|---|
| committer | lcapriotti <lcapriotti@svn> | 2009-10-07 10:43:03 +0000 |
| commit | 0d12222cc84140a6f0a0503728465c7e0eaff088 (patch) | |
| tree | 1ad14108d88592fd1528b15f7c9da6be1c37a6fd | |
| parent | 8218fff47b8c16287181262a79ea7573c38ff6be (diff) | |
fix for improper boot drive detection
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23505 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rwxr-xr-x | tools/XBMCLive/installXBMC | 8 |
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: |