ROOT_SIZE is a string not a number

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 01567ed..59d58f9 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -172,6 +172,8 @@ def Run( vars, log ):
         candidates.append ("/boot/initramfs-%s.img"%(kversion))
         # f20: uses a uid of some kind, e.g. /boot/543f88c129de443baaa65800cf3927ce/<kversion>/initrd
         candidates.append ("/boot/*/%s/initrd"%(kversion))
         candidates.append ("/boot/initramfs-%s.img"%(kversion))
         # f20: uses a uid of some kind, e.g. /boot/543f88c129de443baaa65800cf3927ce/<kversion>/initrd
         candidates.append ("/boot/*/%s/initrd"%(kversion))

+        # Ubuntu:
+        candidates.append ("/boot/initrd.img%s"%(kversion))

         def find_file_in_sysimg (candidates):
             import glob
             for pattern in candidates:
         def find_file_in_sysimg (candidates):
             import glob
             for pattern in candidates:

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index 23b1894..48884e4 100644 (file)
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -131,7 +131,7 @@ def Run( vars, log ):
     utils.sysexec( "lvcreate -L%s -nswap planetlab" % SWAP_SIZE, log )
 
     # check if we want a separate partition for VMs
     utils.sysexec( "lvcreate -L%s -nswap planetlab" % SWAP_SIZE, log )
 
     # check if we want a separate partition for VMs

-    one_partition = (ROOT_SIZE == -1)
+    one_partition = (ROOT_SIZE == "-1")

     if (one_partition):
         remaining_extents= get_remaining_extents_on_vg( vars, log )
         utils.sysexec( "lvcreate -l%s -nroot planetlab" % remaining_extents, log )
     if (one_partition):
         remaining_extents= get_remaining_extents_on_vg( vars, log )
         utils.sysexec( "lvcreate -l%s -nroot planetlab" % remaining_extents, log )