remove svn keywords and use %{SCMURL} in spec file

[bootmanager.git] / source / steps / InstallPartitionDisks.py

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index 65b7fc6..9023b43 100644 (file)
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -60,7 +57,7 @@ def Run( vars, log ):
 
         if NODE_MODEL_OPTIONS & ModelOptions.RAWDISK:
             VSERVERS_SIZE= "-1"
-            if "VSERVER_SIZE" in vars:
+            if "VSERVERS_SIZE" in vars:
                 VSERVERS_SIZE= vars["VSERVERS_SIZE"]
                 if VSERVERS_SIZE == "" or VSERVERS_SIZE == 0:
                     raise ValueError, "VSERVERS_SIZE"
@@ -83,7 +80,7 @@ def Run( vars, log ):
     utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["swap"], log )
     utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["vservers"], log )
     utils.sysexec_noerr( "vgchange -an", log )
-    utils.sysexec_noerr( "vgremove planetlab", log )
+    utils.sysexec_noerr( "vgremove -f planetlab", log )
 
     log.write( "Running vgscan for devices\n" )
     utils.sysexec_noerr( "vgscan", log )