X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsysteminfo.py;h=921ede6dd9d55ede051c0ad867540bb20a7ca5a2;hb=d4be39e78e9a1a0c1885958e74189280a281be1b;hp=8e7a594a03169fc8371f62c80e9139988129b5ad;hpb=1136f7d3b68de92034e188e30863a565d738ea52;p=bootmanager.git diff --git a/source/systeminfo.py b/source/systeminfo.py index 8e7a594..921ede6 100755 --- a/source/systeminfo.py +++ b/source/systeminfo.py @@ -1,8 +1,5 @@ #!/usr/bin/python # -# $Id$ -# $URL$ -# # Copyright (c) 2003 Intel Corporation # All rights reserved. # @@ -120,7 +117,8 @@ def get_block_device_list(vars = {}, log = sys.stderr): # table with valid scsi/sata/ide/raid block device names valid_blk_names = {} # add in valid sd and hd block device names - for blk_prefix in ('sd','hd'): + # also check for vd (virtio devices used with kvm) + for blk_prefix in ('sd','hd','vd'): for blk_num in map ( \ lambda x: chr(x), range(ord('a'),ord('z')+1)): devicename="%s%c" % (blk_prefix, blk_num) @@ -152,10 +150,14 @@ def get_block_device_list(vars = {}, log = sys.stderr): # so, lets run sfdisk -l (list partitions) against # most possible block devices, that way they show # up when it comes time to do the install. + + # 27.6.2012 - Using parted instead of sfdisk, assuming + # that doing so respects the behavior mentioned above. + devicenames = valid_blk_names.keys() devicenames.sort() for devicename in devicenames: - os.system( "sfdisk -l /dev/%s > /dev/null 2>&1" % devicename ) + os.system( "parted --script --list /dev/%s > /dev/null 2>&1" % devicename ) # touch file fb = open(DEVICES_SCANNED_FLAG,"w")