Merge branch 'u-i-cloud-init' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

live-build/auto/config

@@ -395,6 +395,9 @@ case $IMAGEFORMAT in
 
 			echo "Configured ubuntu-image for the following gadget model: $MODEL"
 		fi
+
+		# Save the model name used for building, mostly for any model-specific hook execution
+		echo "MODEL=$MODEL" >> config/common
 		# Fake finished configuration for lb build
 		mkdir -p .build
 		touch .build/config

live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot

@@ -22,18 +22,6 @@ _xchroot() {
 #### COMMON architecture independent functions
 arch=$(_xchroot "${rootd}" dpkg --print-architecture)
 
-fake_cloud_init() {
-    # If the cloud does not provide a meta-data service this should be run
-    # This will setup a nocloud datasource on the boot partition.
-    cat << EOF > ${rootd}/etc/cloud/cloud.cfg.d/99-fake_cloud.cfg
-# configure cloud-init for NoCloud
-datasource_list: [ NoCloud, None ]
-datasource:
-  NoCloud:
-    fs_label: system-boot
-EOF
-}
-
 ## --------------
 # remove 127.0.1.1 entry (LP: #440757)
 _xchroot "${rootd}" sh -c 'sed -i "/^127.0.1.1/d" /etc/hosts'
@@ -128,19 +116,8 @@ fi
 
 
 case $arch in
-	# ARM images are special
+	# ARM, ppc and s390 images are special
-	armhf|arm64)
+	armhf|arm64|powerpc|ppc64el|s390x)
-		# Dirty hack because SUBARCH doesn't exist when running chroot hooks,
-		# and we don't want raspi2 images to depend on a cloud data source:
-		if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then
-			fake_cloud_init
-		fi
-
-		echo "Image architecture is ARM. Existing vmbuilder-fixups"
-
-		exit 0
-		;;
-	powerpc|ppc64el|s390x)
 		exit 0
 		;;
 esac

live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot

@@ -0,0 +1,23 @@
+#!/bin/bash -ex
+
+. /root/config/common
+
+# Specific ubuntu-image chroot configuration goes here.
+# Currently the ubuntu-image IMAGEFORMAT is equivalent to building an image
+# for a physical device, not a cloud instance. For such images we want some
+# special cloud-init configuration that should not be happening for cloud
+# cases. This check should be changed to a per-MODEL/per-SUBARCH check once
+# we support building cloud images via ubuntu-image.
+if [ "$IMAGEFORMAT" == "ubuntu-image" ]; do
+    # If the cloud does not provide a meta-data service this should be run
+    # This will setup a nocloud datasource on the boot partition.
+    # This is the default behavior for our ubuntu-image built preinstalled
+    # images.
+    cat << EOF > /etc/cloud/cloud.cfg.d/99-fake_cloud.cfg
+# configure cloud-init for NoCloud
+datasource_list: [ NoCloud, None ]
+datasource:
+  NoCloud:
+    fs_label: system-boot
+EOF
+fi