Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bootstrap-scripts/volume-mappings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ out = subprocess.check_output(['lsblk', '-brn', '-o', 'NAME,SIZE,MOUNTPOINT'])
available_volumes = []
for line in out.splitlines():
fields = line.split(' ')
if len(fields) > 0:
fields[0] = "/dev/%s" % fields[0]
available_volumes.append(fields)
if fields:
fields[0] = "/dev/%s" % fields[0]
available_volumes.append(fields)

# Sort by size and name
available_volumes.sort(key=lambda x: (-int(x[1]), x[2]))
Expand Down Expand Up @@ -71,4 +71,4 @@ with open(outfile, 'w') as volume_mappings_file:
# Check that each requested volume has a line in the mappings file
if mappings_count != requested_volumes_count:
print 'ERROR: %s volumes requested but only managed to assign volumes for %s of them' % (requested_volumes_count, mappings_count)
sys.exit(-1)
sys.exit(-1)