Dropping automagics for casper.

Future live-build versions will still allow to use casper,
but its configuration will be done differently by hooks
in the config tree, rather than embedded and maintenance intensive
code in live-build itself.

11 files changed, 2 insertions, 98 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5f93f4ac0..4598ec662 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -234,15 +234,7 @@ Set_defaults ()
 	# Setting initramfs hook
 	case "${LB_SYSTEM}" in
 		live)
-			case "${LB_MODE}" in
-				ubuntu)
-					LB_INITRAMFS="${LB_INITRAMFS:-casper}"
-					;;
-
-				*)
-					LB_INITRAMFS="${LB_INITRAMFS:-live-boot}"
-					;;
-			esac
+			LB_INITRAMFS="${LB_INITRAMFS:-live-boot}"
 			;;
 
 		normal)
@@ -751,11 +743,6 @@ Set_defaults ()
 			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
 			;;
 
-		casper)
-			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}"
-			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
-			;;
-
 		none)
 			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}"
 			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 5dce94123..066f4f135 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -97,40 +97,6 @@ then
 	esac
 fi
 
-case "${LB_INITRAMFS}" in
-	casper)
-		for INITRD in binary/casper/initrd.img*
-		do
-			mkdir -p binary/uuid
-			cd binary/uuid
-
-			case "${LB_INITRAMFS_COMPRESSION}" in
-				gzip)
-					zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-
-				bzip2)
-					bzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-
-				lzma)
-					lzcat -S "" "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-			esac
-
-			if [ -e conf/uuid.conf ]
-			then
-				mv conf/uuid.conf "../.disk/casper-uuid${INITRD#binary/casper/initrd.img}"
-			else
-				Echo_warning "Failed to find casper uuid.conf in '${INITRD}'"
-			fi
-
-			cd ${OLDPWD}
-			rm -rf binary/uuid
-		done
-		;;
-esac
-
 case "${LB_DEBIAN_INSTALLER}" in
 	cdrom)
 		echo "main" > binary/.disk/base_components
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index 008ce8292..ed29417b5 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -132,10 +132,6 @@ else
 fi
 
 case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
 	live-boot)
 		INITFS="live"
 		;;
@@ -149,10 +145,6 @@ esac
 case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
 			live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 926df668e..659db123d 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -106,10 +106,6 @@ else
 fi
 
 case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
 	live-boot)
 		INITFS="live"
 		;;
@@ -123,10 +119,6 @@ esac
 case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
 			live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index b3616be87..6227a241c 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -44,10 +44,6 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 case "${LB_INITRAMFS}" in
-	casper)
-		DESTDIR="binary/casper"
-		;;
-
 	live-boot)
 		DESTDIR="binary/live"
 		;;
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 3e7a6f49e..ceee2c380 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -44,11 +44,6 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		SUFFIX="manifest"
-		;;
-
 	live-boot)
 		INITFS="live"
 		SUFFIX="packages"
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 1784a8688..96fb4f101 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -80,10 +80,6 @@ Install_package
 
 # Setting destination directory
 case "${LB_INITRAMFS}" in
-	casper)
-		DESTDIR="binary/casper"
-		;;
-
 	live-boot)
 		DESTDIR="binary/live"
 		;;
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 6b3ee50e3..ba2f49a22 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -49,10 +49,6 @@ case "${LB_ARCHITECTURES}" in
 esac
 
 case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
 	live-boot)
 		INITFS="live"
 		;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 5c9ce04bb..42203297b 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -48,10 +48,6 @@ Check_architectures amd64 i386
 Check_crossarchitectures
 
 case "${LB_INITRAMFS}" in
-	casper)
-		_INITRAMFS="casper"
-		;;
-
 	*)
 		_INITRAMFS="live"
 		;;
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 5c4673282..888fdbe23 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -65,10 +65,6 @@ esac
 
 # Update initramfs (always, because of udev rules in initrd)
 case "${LB_INITRAMFS}" in
-	casper)
-		UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
-		;;
-
 	live-boot)
 		#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
 		;;
@@ -104,10 +100,6 @@ case "${LB_INITRAMFS_COMPRESSION}" in
 esac
 
 case "${LB_INITRAMFS}" in
-	casper)
-		ID="999"
-		;;
-
 	live-boot)
 		ID="1000"
 		;;
diff --git a/scripts/build/config b/scripts/build/config
index d713314ac..e526d9276 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -61,7 +61,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--grub-splash FILE]\n\
 \t    [--gzip-options OPTION|\"OPTIONS\"]\n\
 \t    [--ignore-system-defaults]\n\
-\t    [--initramfs auto|none|live-boot|casper]\n\
+\t    [--initramfs auto|none|live-boot]\n\
 \t    [--initramfs-compression bzip2|gzip|lzma]\n\
 \t    [--initsystem sysvinit|systemd|upstart|none]\n\
 \t    [--image-name [NAME]\n\
@@ -1350,10 +1350,6 @@ then
 			esac
 			;;
 
-		casper)
-			echo "casper" > config/package-lists/live.list.chroot
-			;;
-
 		*)
 			;;
 esac