* improve availability - reliability : start a fallback sshd very early in the bm...

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

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index 014fcd7..77bc9d4 100644 (file)
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -15,7 +15,6 @@ import popen2
 from Exceptions import *
 import utils
 import BootServerRequest
-import compatibility
 
 import ModelOptions
 
@@ -28,7 +27,6 @@ def Run( vars, log ):
     TEMP_PATH                somewhere to store what we need to run
     ROOT_SIZE                the size of the root logical volume
     SWAP_SIZE                the size of the swap partition
-    BOOT_CD_VERSION          A tuple of the current bootcd version
     """
 
     log.write( "\n\nStep: Install: partitioning disks.\n" )
@@ -51,10 +49,6 @@ def Run( vars, log ):
         if SWAP_SIZE == "" or SWAP_SIZE == 0:
             raise ValueError, "SWAP_SIZE invalid"
 
-        BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
-        if BOOT_CD_VERSION == "":
-            raise ValueError, "BOOT_CD_VERSION"
-
         NODE_MODEL_OPTIONS= vars["NODE_MODEL_OPTIONS"]
 
         PARTITIONS= vars["PARTITIONS"]
@@ -69,10 +63,6 @@ def Run( vars, log ):
     bs_request= BootServerRequest.BootServerRequest()
 
     
-    # old cds need extra utilities to partition disks and setup lvm
-    if BOOT_CD_VERSION[0] == 2:
-        compatibility.setup_partdisks_2x_cd( vars, log )
-
     # disable swap if its on
     utils.sysexec_noerr( "swapoff %s" % PARTITIONS["swap"], log )
 
@@ -171,10 +161,6 @@ def single_partition_device( device, vars, log ):
     return 1 if sucessful, 0 otherwise
     """
 
-    BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
-    if BOOT_CD_VERSION[0] == 2:
-        compatibility.setup_partdisks_2x_cd( vars, log )
-
     import parted
     
     lvm_flag= parted.partition_flag_get_by_name('lvm')
@@ -186,63 +172,27 @@ def single_partition_device( device, vars, log ):
         # get the device
         dev= parted.PedDevice.get(device)
 
-        # 2.x cds have different libparted that 3.x cds, and they have
-        # different interfaces
-        if BOOT_CD_VERSION[0] >= 3:
-
-            # create a new partition table
-            disk= dev.disk_new_fresh(parted.disk_type_get("msdos"))
-
-            # create one big partition on each block device
-            constraint= dev.constraint_any()
-
-            new_part= disk.partition_new(
-                parted.PARTITION_PRIMARY,
-                parted.file_system_type_get("ext2"),
-                0, 1 )
-
-            # make it an lvm partition
-            new_part.set_flag(lvm_flag,1)
-
-            # actually add the partition to the disk
-            disk.add_partition(new_part, constraint)
+        # create a new partition table
+        disk= dev.disk_new_fresh(parted.disk_type_get("msdos"))
 
-            disk.maximize_partition(new_part,constraint)
+        # create one big partition on each block device
+        constraint= dev.constraint_any()
 
-            disk.commit()
-            del disk
-        else:
-            # create a new partition table
-            dev.disk_create(parted.disk_type_get("msdos"))
-
-            # get the disk
-            disk= parted.PedDisk.open(dev)
-
-                # create one big partition on each block device
-            part= disk.next_partition()
-            while part:
-                if part.type == parted.PARTITION_FREESPACE:
-                    new_part= disk.partition_new(
-                        parted.PARTITION_PRIMARY,
-                        parted.file_system_type_get("ext2"),
-                        part.geom.start,
-                        part.geom.end )
-
-                    constraint = disk.constraint_any()
+        new_part= disk.partition_new(
+            parted.PARTITION_PRIMARY,
+            parted.file_system_type_get("ext2"),
+            0, 1 )
 
-                    # make it an lvm partition
-                    new_part.set_flag(lvm_flag,1)
+        # make it an lvm partition
+        new_part.set_flag(lvm_flag,1)
 
-                    # actually add the partition to the disk
-                    disk.add_partition(new_part, constraint)
+        # actually add the partition to the disk
+        disk.add_partition(new_part, constraint)
 
-                    break
+        disk.maximize_partition(new_part,constraint)
 
-                part= disk.next_partition(part)
-
-            disk.write()
-            disk.close()
-            del disk
+        disk.commit()
+        del disk
             
     except BootManagerException, e:
         log.write( "BootManagerException while running: %s\n" % str(e) )
@@ -283,24 +233,12 @@ def get_partition_path_from_device( device, vars, log ):
     given a device, return the path of the first partition on the device
     """
 
-    BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
-        
     # those who wrote the cciss driver just had to make it difficult
-    if BOOT_CD_VERSION[0] >= 3:
-        cciss_test= "/dev/cciss"
-        if device[:len(cciss_test)] == cciss_test:
-            part_path= device + "p1"
-        else:
-            part_path= device + "1"
+    cciss_test= "/dev/cciss"
+    if device[:len(cciss_test)] == cciss_test:
+        part_path= device + "p1"
     else:
-        # if device ends in /disc, we need to make it end in
-        # /part1 to indicate the first partition (for devfs based 2.x cds)
-        dev_parts= string.split(device,"/")
-        if dev_parts[-1] == "disc":
-            dev_parts[-1]= "part1"
-            part_path= string.join(dev_parts,"/")
-        else:
-            part_path= device + "1"
+        part_path= device + "1"
 
     return part_path