Merge lp:~oem-solutions-releng/live-build/lb-sg-2.x-explicit-rootfs-size into lp:~ce-infrastructure/live-build/lb-sg-2.x

[Timothy R. Chavez]

Make the size of the rootfs configurable (in MB's). We retain the default, which is to allow live-build to auto-calculate what the size of the rootfs should be.

[Nicola Heald (notnownikki)]

Looks fine to me, +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-27 01:09:57 +0000
+++ debian/changelog	2013-04-02 16:15:34 +0000
@@ -1,3 +1,12 @@
+live-build (2.0.12-2cesg20) lucid; urgency=low
+
+  * functions/defaults.sh,
+    scripts/build/lb_binary_rootfs,
+    scripts/build/lb_config:
+    - Make rootfs size configurable
+
+ -- Timothy Chavez <[e-mail]>  Mon, 01 Apr 2013 11:58:02 -0500
+
 live-build (2.0.12-2cesg19) lucid; urgency=low
 
   * functions/defaults.sh

=== modified file 'functions/defaults.sh'
--- functions/defaults.sh	2013-03-27 01:09:57 +0000
+++ functions/defaults.sh	2013-04-02 16:15:34 +0000
@@ -516,6 +516,9 @@
 	# Setting chroot filesystem
 	LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}"
 
+	# Setting chroot filesystem size
+	LB_CHROOT_FILESYSTEM_SIZE="${LB_CHROOT_FILESYSTEM_SIZE:-auto}"
+
 	# Setting chroot filesystem blocksize
 	LB_CHROOT_FILESYSTEM_BLOCKSIZE="${LB_CHROOT_FILESYSTEM_BLOCKSIZE:-1024}"
 

=== modified file 'scripts/build/lb_binary_rootfs'
--- scripts/build/lb_binary_rootfs	2013-03-27 01:09:57 +0000
+++ scripts/build/lb_binary_rootfs	2013-04-02 16:15:34 +0000
@@ -107,8 +107,15 @@
 				;;
 		esac
 
-		REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
-		REAL_INODES="$(Calculate_partition_size ${INODES} ${LB_CHROOT_FILESYSTEM})"
+		if [ "$LB_CHROOT_FILESYSTEM_SIZE" = "auto" ]
+		then
+			REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
+			REAL_INODES="$(Calculate_partition_size ${INODES} ${LB_CHROOT_FILESYSTEM})"
+		else
+			REAL_DIM="${LB_CHROOT_FILESYSTEM_SIZE}"
+			# Passing -N 0 will produce the same result as passing no argument at all
+			REAL_INODES="0"
+		fi
 
 		RESERVED_PERCENTAGE="--reserved-percentage"
 

=== modified file 'scripts/build/lb_config'
--- scripts/build/lb_config	2013-03-27 01:09:57 +0000
+++ scripts/build/lb_config	2013-04-02 16:15:34 +0000
@@ -454,6 +454,12 @@
 				shift 2
 				;;
 
+			--chroot-filesystem-size)
+				LB_CHROOT_FILESYSTEM_SIZE="${2}"
+				shift 2
+				;;
+
+
 			--chroot-filesystem-blocksize)
 				LB_CHROOT_FILESYSTEM_BLOCKSIZE="${2}"
 				shift 2
@@ -1086,6 +1092,10 @@
 # (Default: ${LB_CHROOT_FILESYSTEM})
 LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
 
+# \$LB_CHROOT_FILESYSTEM_SIZE; set chroot filesystem size (in MB)
+# (Default: ${LB_CHROOT_FILESYSTEM_SIZE})
+LB_CHROOT_FILESYSTEM_SIZE="${LB_CHROOT_FILESYSTEM_SIZE}"
+
 # \$LB_CHROOT_FILESYSTEM_BLOCKSIZE; set chroot filesystem blocksize
 # (Default: ${LB_CHROOT_FILESYSTEM_BLOCKSIZE})
 LB_CHROOT_FILESYSTEM_BLOCKSIZE="${LB_CHROOT_FILESYSTEM_BLOCKSIZE}"