Merge lp:~xnox/debian-cd/drop-integrity-check-menu-entry into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

focal: drop casper integrity-check menu-entry, it is now performed on every boot

focal: drop casper integrity-check menu-entry, it is now performed on every boot

[Dimitri John Ledkov (xnox)]

https://launchpad.net/ubuntu/+source/casper/1.440 and up do integrity check by default, later uploads fixed integration with different plymouth themes.

[Iain Lane (laney)]

review: Approve

=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64	2020-04-01 10:28:48 +0000
+++ tools/boot/focal/boot-amd64	2020-04-08 22:37:25 +0000
@@ -644,27 +644,7 @@
 applies ltsp=install
 EOF
 fi
-if [ "$CDIMAGE_LIVE" = 1 ]; then
-    cat >> boot$N/isolinux/txt.cfg <<EOF
-label check
-  menu label ^Check disc for defects
-  kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---
-EOF
-    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "Check disc for defects" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
-	initrd	$CASPER_INITRD\$casper_flavour
-}
-EOF
-    cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "Check disc for defects" {
-	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
-	initrd	$CASPER_INITRD\$casper_flavour
-}
-EOF
-elif [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
+if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
     cat >> boot$N/isolinux/txt.cfg <<EOF
 label check
   menu label ^Check disc for defects
 
=== modified file 'tools/boot/focal/boot-arm64'
--- tools/boot/focal/boot-arm64	2020-02-18 17:37:38 +0000
+++ tools/boot/focal/boot-arm64	2020-04-08 22:37:25 +0000
@@ -247,21 +247,7 @@
 EOF
   done
 fi
-if [ "$CDIMAGE_LIVE" = 1 ]; then
-    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "Check disc for defects" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
-	initrd	$CASPER_INITRD
-}
-EOF
-    cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "Check disc for defects" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
-	initrd	$CASPER_INITRD
-}
-EOF
-elif [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
+if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
   for kp in $KERNEL_PREFIXES; do
     cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
 menuentry "Check disc for defects" {