reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

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

diff --git a/source/steps/InitializeBootManager.py b/source/steps/InitializeBootManager.py
index 9baaca9..75fd10f 100644 (file)
--- a/source/steps/InitializeBootManager.py
+++ b/source/steps/InitializeBootManager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -48,13 +48,13 @@ def Run(vars, log):
 
     # define the basic partition paths
     PARTITIONS = {}
-    PARTITIONS["root"] = "/dev/planetlab/root"
-    PARTITIONS["swap"] = "/dev/planetlab/swap"
-    PARTITIONS["vservers"] = "/dev/planetlab/vservers"
+#    PARTITIONS["root"] = "/dev/planetlab/root"
+#    PARTITIONS["swap"] = "/dev/planetlab/swap"
+#    PARTITIONS["vservers"] = "/dev/planetlab/vservers"
     # Linux 2.6 mounts LVM with device mapper
-    PARTITIONS["mapper-root"] = "/dev/mapper/planetlab-root"
-    PARTITIONS["mapper-swap"] = "/dev/mapper/planetlab-swap"
-    PARTITIONS["mapper-vservers"] = "/dev/mapper/planetlab-vservers"
+    PARTITIONS["root"] = "/dev/mapper/planetlab-root"
+    PARTITIONS["swap"] = "/dev/mapper/planetlab-swap"
+    PARTITIONS["vservers"] = "/dev/mapper/planetlab-vservers"
     vars["PARTITIONS"] = PARTITIONS
 
     log.write("Opening connection to API server\n")