X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FCheckForNewDisks.py;h=9bb9b44385742ce02ae74b8b1db699c1eec1f92c;hb=27d9e3ef16bff9214074e88ce76eb686f53f3d81;hp=0d17cffd55973b663564e82e0834911a8661eb38;hpb=ad2b085c03c31c412eece4d2c09e41aa1559db9e;p=bootmanager.git diff --git a/source/steps/CheckForNewDisks.py b/source/steps/CheckForNewDisks.py index 0d17cff..9bb9b44 100644 --- a/source/steps/CheckForNewDisks.py +++ b/source/steps/CheckForNewDisks.py @@ -87,10 +87,13 @@ def Run( vars, log ): # this is the lvm partition, if it exists on that device lvm_partition= "%s1" % device - cmd = "pvdisplay %s | grep -q 'planetlab'" % lvm_partition - already_added= utils.sysexec_noerr(cmd, log) - - if already_added: + cciss_lvm_partition= "%sp1" % device + cmd = "pvdisplay %s | grep -q 'planetlab'" + + already_added= utils.sysexec_noerr(cmd % lvm_partition, log) + cciss_already_added= utils.sysexec_noerr(cmd % cciss_lvm_partition, log) + + if already_added or cciss_already_added: log.write( "It appears %s is part of the volume group, continuing.\n" % device ) continue