Drop special-casing of ubuntu-core:system-image in places, now that

ubuntu-core unambiguously refers to the snappy Ubuntu Core image.

debian/changelog

@@ -1,6 +1,8 @@
 livecd-rootfs (2.410) UNRELEASED; urgency=medium
 
   * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
+  * Drop special-casing of ubuntu-core:system-image in places, now that
+    ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 May 2016 15:02:22 -0700
 

live-build/auto/config

@@ -350,11 +350,6 @@ case $PROJECT in
 		;;
 
 	ubuntu-core)
-		# mvo: This is for cron.daily-preinstalled
-		#      CDIMAGE_PREINSTALLED is not passed from build.py
-		#      and PREINSTALLED means something different. So
-		#      we use SUBPROJECT to pass on the information
-		if [ "$SUBPROJECT" = "system-image" ]; then
 		OPTS="${OPTS:+$OPTS }--apt-recommends false"
 
 		# some workarounds because the seeds are not quite
@@ -409,7 +404,6 @@ case $PROJECT in
 
 		# universe needed for 'system-image-cli' and multiverse for firmware
 		COMPONENTS='main restricted universe multiverse'
-		fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
@@ -561,17 +555,11 @@ case $ARCH in
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd)
-		case $SUBPROJECT in
-			system-image)
-				# keep the kernel for the system-image build
-				;;
-			*)
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
 		;;
-		esac
 esac
 
 add_chroot_hook update-apt-file-cache