X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallPartitionDisks.py;h=f0d3d97ab461eddfaf6f0bcfac16957f4a02d82b;hb=135271d073a8e7ddfe044ba62c35bb4f7a4676b0;hp=e04a31943b29d9daf1154eb8f3cd3cea32539c54;hpb=14a1b7b57c7d4e4ec898ee421d6ce5dba046ca7c;p=bootmanager.git

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index e04a319..f0d3d97 100644
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -41,7 +41,9 @@ def Run( vars, log ):
         if( len(INSTALL_BLOCK_DEVICES) == 0 ):
             raise ValueError, "INSTALL_BLOCK_DEVICES is empty"
 
-        ROOT_SIZE= vars["ROOT_SIZE"]
+        # use vs_ROOT_SIZE or lxc_ROOT_SIZE as appropriate
+        varname=vars['virt']+"_ROOT_SIZE"
+        ROOT_SIZE= vars[varname]
         if ROOT_SIZE == "" or ROOT_SIZE == 0:
             raise ValueError, "ROOT_SIZE invalid"
 
@@ -159,17 +161,28 @@ def Run( vars, log ):
     # reserved-blocks-percentages
     filesystems = {"root":5,"vservers":0}
 
-    # make the file systems
-    for fs in filesystems.keys():
-        # get the reserved blocks percentage
-        rbp = filesystems[fs]
-        devname = PARTITIONS[fs]
+    # ROOT filesystem is always with ext2
+    fs = 'root'
+    rbp = filesystems[fs]
+    devname = PARTITIONS[fs]
+    log.write("formatting %s partition (%s)%s.\n" % (fs,devname,txt))
+    utils.sysexec( "mkfs.ext2 -q %s -m %d -j %s" % (option,rbp,devname), log )
+    # disable time/count based filesystems checks
+    utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % devname, log)
+
+    # VSERVER filesystem with btrfs to support snapshoting and stuff
+    fs = 'vservers'
+    rbp = filesystems[fs]
+    devname = PARTITIONS[fs]
+    if vars['virt']=='vs':
         log.write("formatting %s partition (%s)%s.\n" % (fs,devname,txt))
         utils.sysexec( "mkfs.ext2 -q %s -m %d -j %s" % (option,rbp,devname), log )
-
-    # disable time/count based filesystems checks
-    for filesystem in ("root","vservers"):
-        utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log)
+        # disable time/count based filesystems checks
+        utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % devname, log)
+    else:
+        log.write("formatting %s btrfs partition (%s).\n" % (fs,devname))
+        utils.sysexec( "mkfs.btrfs %s" % (devname), log )
+        # as of 2013/02 it looks like there's not yet an option to set fsck frequency with btrfs
 
     # save the list of block devices in the log
     log.write( "Block devices used (in lvm): %s\n" % repr(used_devices))
@@ -254,40 +267,37 @@ def single_partition_device_1_x ( device, vars, log):
 def single_partition_device_2_x ( device, vars, log):
     try:
         log.write("Using pyparted 2.x\n")
-        # wipe the old partition table
-        utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log )
-        # get the device
-        dev= parted.Device(device)
+
+        # Thierry june 2012 -- for disks larger than 2TB
+        # calling this with part_type='msdos' would fail at the maximizePartition stage
         # create a new partition table
-        # xxx -- Thierry june 2012
-        # original code was going for the msdos version only
-        # Marco Bicudo reported an error with a disk larger than 2TB
-        # and confirmed he node would take off by just changing 'msdos' into 'gpt'
-        # this version below has been tried but does not work
-        # as a matter of fact on the big node an exception gets thrown later
-        # at the maximizePartition stage only, which of course makes sense 
-        # so bottom line is, we need to find something smarter...
-        # xxx
+        def partition_table (device, part_type, fs_type):
+            # wipe the old partition table
+            utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log )
+            # get the device
+            dev= parted.Device(device)
+            disk = parted.freshDisk(dev,part_type)
+            # create one big partition on each block device
+            constraint= parted.constraint.Constraint (device=dev)
+            geometry = parted.geometry.Geometry (device=dev, start=0, end=1)
+            fs = parted.filesystem.FileSystem (type=fs_type,geometry=geometry)
+            new_part= parted.partition.Partition (disk, type=parted.PARTITION_NORMAL,
+                                                  fs=fs, geometry=geometry)
+            # make it an lvm partition
+            new_part.setFlag(parted.PARTITION_LVM)
+            # actually add the partition to the disk
+            disk.addPartition(new_part, constraint)
+            disk.maximizePartition(new_part,constraint)
+            disk.commit()
+            log.write ("Current disk for %s - partition type %s\n%s\n"%(device,part_type,disk))
+            log.write ("Current dev for %s\n%s\n"%(device,dev))
+            del disk
+
         try:
-            disk= parted.freshDisk(dev,'msdos')
-        # use gpt as a fallback for disks larger than 2TB
+            partition_table (device, 'msdos', 'ext2')
         except:
-            disk= parted.freshDisk(dev,'gpt')
-        # create one big partition on each block device
-        constraint= parted.constraint.Constraint (device=dev)
-        geometry = parted.geometry.Geometry (device=dev, start=0, end=1)
-        fs = parted.filesystem.FileSystem (type="ext2",geometry=geometry)
-        new_part= parted.partition.Partition (disk, type=parted.PARTITION_NORMAL, 
-                                              fs=fs, geometry=geometry)
-        # make it an lvm partition
-        new_part.setFlag(parted.PARTITION_LVM)
-        # actually add the partition to the disk
-        disk.addPartition(new_part, constraint)
-        disk.maximizePartition(new_part,constraint)
-        disk.commit()
-        print >>log, 'Current disk for %s'%device,disk
-        print >>log, 'Current dev for %s'%device,dev
-        del disk
+            partition_table (device, 'gpt', 'ext2')
+
     except Exception, e:
         log.write( "Exception inside single_partition_device_2_x : %s\n" % str(e) )
         import traceback