Merge lp:~dpigott/lava-master-image-scripts/add-master-rootfs-size-option into lp:lava-master-image-scripts

[Dave Pigott]

Added an option to specify master rootfs size. Additionally added alternative options for testrootfs size to maintain (a) backwards compatibility and (b) consistency in option naming

[Zygmunt Krynicki (zyga)]

+ echo "Usage: lava-create-master [--rebuild-vanilla] [--verbose] (--help | --version | DEVICE) [ --output|-o IMAGE] [ --master-rootfs-size|-m SIZE] [--test-rootfs-size|-r|rootfs-size SIZE] [--userdata-size|-u SIZE]"

You probably wanted --rootfs-size there for consistency, also, moving -r to be the last item of the alternative set would be consistent with the rest

[Dave Pigott (dpigott)]

Yeah, I maintained rootfs-size for backward compatibility. Good point about placement. Will make that change.

On 2 Apr 2013, at 15:50, Zygmunt Krynicki <email address hidden> wrote:

> + echo "Usage: lava-create-master [--rebuild-vanilla] [--verbose] (--help | --version | DEVICE) [ --output|-o IMAGE] [ --master-rootfs-size|-m SIZE] [--test-rootfs-size|-r|rootfs-size SIZE] [--userdata-size|-u SIZE]"
>
> You probably wanted --rootfs-size there for consistency, also, moving -r to be the last item of the alternative set would be consistent with the rest
> --
> https://code.launchpad.net/~dpigott/lava-master-image-scripts/add-master-rootfs-size-option/+merge/156576
> You are the owner of lp:~dpigott/lava-master-image-scripts/add-master-rootfs-size-option.

[lp:~dpigott/lava-master-image-scripts/add-master-rootfs-size-option]

75. By Dave Pigott on 2013-04-03

Consistency change in help order

Unmerged revisions

75. By Dave Pigott on 2013-04-03

Consistency change in help order

74. By Dave Pigott on 2013-04-02

Add ability to specify master image rootfs size

=== modified file 'README'
--- README	2012-09-05 20:28:45 +0000
+++ README	2013-04-03 08:26:25 +0000
@@ -29,3 +29,6 @@
 extra minutes to finish. The interactive serial console will be activated after
 this process has finished. Once this process is done it is *not recommended* to
 clone the SD card anymore.
+
+Note: If you wish to build a different rootfs size with this tool, you will have
+to force it with a --rebuild-vanilla
 
=== modified file 'lava-create-master'
--- lava-create-master	2013-03-13 13:21:33 +0000
+++ lava-create-master	2013-04-03 08:26:25 +0000
@@ -20,6 +20,8 @@
 # defaults to 4G (4 GigaBytes)
 export ROOTFS_SIZE="4G"
 
+export MASTER_ROOTFS_SIZE="1G"
+
 # Used during partitioning on first boot - size of the userdata partition
 # defaults to 2G (2 GigaBytes)
 export USERDATA_SIZE="2G"
@@ -73,7 +75,7 @@
 
 show_usage() {
     # Display the usage line
-    echo "Usage: lava-create-master [--rebuild-vanilla] [--verbose] (--help | --version | DEVICE) [ --output|-o IMAGE] [--rootfs-size|-r SIZE] [--userdata-size|-u SIZE]"
+    echo "Usage: lava-create-master [--rebuild-vanilla] [--verbose] (--help | --version | DEVICE) [ --output|-o IMAGE] [ --master-rootfs-size|-m SIZE] [--test-rootfs-size|rootfs-size SIZE|-r] [--userdata-size|-u SIZE]"
 }
 
 
@@ -88,7 +90,8 @@
     printf -- " %-9s - %s\n" "--verbose" "Display additional messages"
     printf -- " %-9s - %s\n" "--output" "Save the output as IMAGE"
     printf -- " %-9s - %s\n" "--rebuild-vanilla" "Always rebuild vanilla image"
-    printf -- " %-9s - %s\n" "--rootfs-size" "Size of the testrootfs partition (default 4G)"
+    printf -- " %-9s - %s\n" "--master-rootfs-size" "Size of the master rootfs partition"
+    printf -- " %-9s - %s\n" "--test-rootfs-size" "Size of the testrootfs partition (default 4G)"
     printf -- " %-9s - %s\n" "--userdata-size" "Size of the userdata partition (default 2G), no meaning for iMX and Origen"
     echo
     echo "supported devices:"
@@ -136,7 +139,11 @@
                 OUTPUT_IMAGE="$2"
                 shift 2
                 ;;
-            --rootfs-size|-r)
+            --master-rootfs-size|-m)
+                MASTER_ROOTFS_SIZE="$2"
+                shift 2
+                ;;
+            --rootfs-size|--test-rootfs-size|-r)
                 ROOTFS_SIZE="$2"
                 shift 2
                 ;;
@@ -367,7 +374,7 @@
             --dev $LMC_DEV \
             --rootfs ext4 \
             --image-file $CACHE_DIR/pristine-images/$dev-vanilla.img \
-            --image-size 1G \
+            --image-size $MASTER_ROOTFS_SIZE \
             --align-boot-part \
             --binary $CACHE_DIR/image-pieces/$ROOTFS \
             --hwpack $CACHE_DIR/image-pieces/$HWPACK \