Merge lp:~xnox/debian-cd/cd-boot-images-amd64 into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

groovy: switch boot-amd64 to cd-boot-images-amd64

[Dimitri John Ledkov (xnox)]

Tested CD-ROM & USB boot, under:
 * bare metal
 * BIOS KVM
 * UEFI KVM

Not Tested:
 * Recent Macbook booting

I currently do not provide HFS+ partition table, with a "blessed" bootloader. I do not know if that is still required on recent Macbooks. If it fails to boot, we can add those, but as far as I know this was fixed and is no longer needed on Macbooks.

[Dimitri John Ledkov (xnox)]

Please review this

[Dimitri John Ledkov (xnox)]

cd-boot-images-amd64 is now in the archive.

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

Discussed elsewhere that these options are documented in the .info for xorissofs instead of in the manpage or the help output (sigh)

review: Approve

=== modified file 'tools/boot/groovy/boot-amd64'
--- tools/boot/groovy/boot-amd64	2020-05-21 21:59:34 +0000
+++ tools/boot/groovy/boot-amd64	2020-06-19 13:49:32 +0000
@@ -12,682 +12,87 @@
 
 N=$1
 CDDIR=$2
-BOOTDIR=
-if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://debian-amd64.alioth.debian.org/debian-installer/daily"
-fi
-if [ ! "$DI_DIST" ]; then
-   export DI_DIST="$DI_CODENAME"
-fi
-if [ -z "$DI_PATH" ]; then
-   DI_PATH="$($BASEDIR/tools/find-newest-installer)"
-fi
-
-default_preseed
-default_language
-
 cd $CDDIR/..
 
-#
-# This script is called with $1 (now $N) as the CD to 
-# make bootable.  N may be in the form "n" or "n_NONUS"
-# There may be more than 4 disks...support extras.
-
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-#
-NN=`echo $N | sed -e 's/_NONUS//'`
-
-if [ "$CDIMAGE_ADDON" ]; then
-    # second disk, at least in spirit
-    NN=2
-fi
-
 > $N.mkisofs_opts
 
-case "$MKISOFS" in
-    *xorriso*)
-        echo -n "-isohybrid-mbr syslinux/usr/lib/ISOLINUX/isohdpfx.bin " >> $N.mkisofs_opts
-        # uncomment to add a small FAT partition on the media
-        # /sbin/mkfs.msdos -n Bla -C test.fat 8192
-        # echo -n "-append_partition 2 0x01 test.fat " >> $N.mkisofs_opts
+# pick default kernel
+FLAVOUR=generic
+if [ "$PROJECT" = "ubuntustudio" ]; then
+    FLAVOUR=lowlatency
+fi
+
+# rename kernel+initrd
+mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
+mv $CDDIR/casper/filesystem.initrd-$FLAVOUR $CDDIR/casper/initrd
+HWE=
+if [ -e $CDDIR/casper/filesystem.kernel-generic-hwe ]; then
+    HWE="true"
+    mv $CDDIR/casper/filesystem.kernel-generic-hwe $CDDIR/casper/hwe-vmlinuz
+    mv $CDDIR/casper/filesystem.initrd-generic-hwe $CDDIR/casper/hwe-initrd
+fi
+
+# download, extract and include cd-boot-images
+mkdir cd-boot-images
+$BASEDIR/tools/apt-selection download cd-boot-images-amd64
+dpkg --fsys-tarfile cd-boot-images-amd64*_all.deb | tar xf - -C cd-boot-images
+echo -n "-J -joliet-long -l -b boot/grub/i386-pc/eltorito.img -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info --grub2-mbr cd-boot-images/usr/share/cd-boot-images-amd64/tree/boot/grub/i386-pc/boot_hybrid.img --efi-boot boot/grub/efi.img -efi-boot-part --efi-boot-image -partition_offset 16 cd-boot-images/usr/share/cd-boot-images-amd64/tree" >> $N.mkisofs_opts
+
+default_kernel_params
+
+# generate grub.cfg
+mkdir -p $CDDIR/boot/grub/
+cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+set timeout=30
+
+loadfont unicode
+
+set menu_color_normal=white/black
+set menu_color_highlight=black/light-gray
+
+menuentry "$HUMANPROJECT" {
+	set gfxpayload=keep
+	linux	/casper/vmlinuz $KERNEL_PARAMS
+	initrd	/casper/initrd
+}
+EOF
+
+# All but server get safe-graphics mode
+if [ "$PROJECT" != "ubuntu-server" ]; then
+    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+menuentry "$HUMANPROJECT (safe graphics)" {
+	set gfxpayload=keep
+	linux	/casper/vmlinuz nomodeset $KERNEL_PARAMS
+	initrd	/casper/initrd
+}
+EOF
+fi
+
+# ubiquity based projects get OEM mode
+case $KERNEL_PARAMS in
+    *maybe-ubiquity*)
+        cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+menuentry "OEM install (for manufacturers)" {
+	set gfxpayload=keep
+	linux	/casper/vmlinuz ${KERNEL_PARAMS/maybe-ubiquity/only-ubiquity oem-config/enable=true}
+	initrd	/casper/initrd
+}
+EOF
         ;;
 esac
 
-# List of boot image for each CD
-KTYPE[1]="" #isolinux multiboot in fact
-KTYPE[2]=""
-# XXX add net-image back when it's fixed
-KTYPE[3]=""
-KTYPE[4]=""
-KTYPE[5]=""
-KTYPE[6]=""
-KTYPE[7]=""
-KTYPE[8]=""
-KTYPE[9]=""
-KTYPE[10]=""
-
-THISTYPE=${KTYPE[$NN]}
-
-PREFIX_PRESEED="$(dirname "$DEFAULT_PRESEED")/"
-PREFIX_GA=""
-PREFIX_HWE=""
-KERNEL_PREFIXES="PREFIX_GA"
-if [ "$BACKPORT_KERNEL" ]; then
-    PREFIX_HWE="hwe-"
-    if [ "$PROJECT" = ubuntu-server ]; then
-        KERNEL_PREFIXES="$KERNEL_PREFIXES PREFIX_HWE"
-    fi
-fi
-
-DISK_IMAGES=""
-BOOT_IMAGES=""
-TAR_IMAGES=""
-for kp in $KERNEL_PREFIXES; do
-    BOOT_IMAGES="$BOOT_IMAGES ${!kp}cdrom/initrd.gz ${!kp}cdrom/vmlinuz ${!kp}cdrom/debian-cd_info.tar.gz"
-    TAR_IMAGES="$TAR_IMAGES ${!kp}netboot/netboot.tar.gz"
-done
-
-case $PROJECT in
-    ubuntustudio)
-	if [ "$CDIMAGE_LIVE" ]; then
-	    FLAVOUR=lowlatency
-	else
-	    FLAVOUR=generic
-	fi
-	;;
-    *)
-	FLAVOUR=generic
-	;;
-esac
-
-# Download boot images
-for image in MANIFEST.udebs $BOOT_IMAGES $DISK_IMAGES $TAR_IMAGES; do
-    if [ ! -e "$image" ]; then
-	dir=$(dirname $image)
-	mkdir -p $dir
-	if [ ! "$DI_WWW_HOME" ];then
-		cp "$DI_PATH/current/legacy-images/$image" "$image"
-	else
-		wget "$DI_WWW_HOME/$image" -O "$image"
-	fi
-    fi
-done
-
-if [ "$NN" = "1" ]; then
-    list_kernel_abis $BOOT_IMAGES | check_kernel_sync $FLAVOUR
-
-    echo "Using ISOLINUX boot-disks image on CD$N"
-    mkdir -p $CDDIR/../syslinux boot$N/isolinux
-    SYSLINUXDEB="$($BASEDIR/tools/apt-selection cache show syslinux-common | \
-	grep ^Filename | awk '{print $2}')"
-    (dpkg --fsys-tarfile "$MIRROR/$SYSLINUXDEB" | \
-	tar xf - -C $CDDIR/../syslinux ./usr/lib)
-    ISOLINUXDEB="$($BASEDIR/tools/apt-selection cache show isolinux | \
-	grep ^Filename | awk '{print $2}')"
-    (dpkg --fsys-tarfile "$MIRROR/$ISOLINUXDEB" | \
-	tar xf - -C $CDDIR/../syslinux ./usr/lib)
-    cp -f $CDDIR/../syslinux/usr/lib/ISOLINUX/isolinux.bin boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/vesamenu.c32 boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/ldlinux.c32 boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libcom32.c32 boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libutil.c32 boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/gfxboot.c32 boot$N/isolinux/
-    cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/chain.c32 boot$N/isolinux/
-
-    GFXBOOT=
-    if THEMEDEB="$($BASEDIR/tools/apt-selection cache show gfxboot-theme-ubuntu)"; then
-	THEMEDEB="$(echo "$THEMEDEB" | grep ^Filename | awk '{print $2}')"
-	dpkg --fsys-tarfile "$MIRROR/$THEMEDEB" | tar xf - -C . ./usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz
-	tar zxf usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C boot$N/isolinux
-	GFXBOOT=1
-    fi
-
-    rm -rf usr
-    if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    for kp in $KERNEL_PREFIXES; do
-      cp -lf "${!kp}cdrom/vmlinuz" "$CDDIR/install/${!kp}vmlinuz"
-      cp -lf "${!kp}cdrom/initrd.gz" "$CDDIR/install/${!kp}initrd.gz"
-    done
-    fi
-    if [ "$CDIMAGE_LIVE" = 1 ]; then
-	CASPER_KERNEL=/casper/vmlinuz
-	CASPER_INITRD=/casper/initrd
-	for kernel in $CDDIR/casper/filesystem.kernel-*; do
-	    flavour=${kernel##*filesystem.kernel-}
-	    flavour2="-${flavour}"
-	    [ "$flavour" = "${FLAVOUR}" ] && flavour2=""
-	    mv $CDDIR/casper/filesystem.kernel-$flavour $CDDIR$CASPER_KERNEL${flavour2}
-	    mv $CDDIR/casper/filesystem.initrd-$flavour $CDDIR$CASPER_INITRD${flavour2}
-	done
-    fi
-    echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " >> $N.mkisofs_opts
-    case "$MKISOFS" in
-	*xorriso*)
-	    echo -n "-eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -isohybrid-apm-hfsplus " >> $N.mkisofs_opts
-	    ;;
-	*)
-	    echo -n "-eltorito-alt-boot -efi-boot boot/grub/efi.img -no-emul-boot " >> $N.mkisofs_opts
-	    ;;
-    esac
-else
-    if [ -n "$THISTYPE" ]; then
-	echo "Using $THISTYPE boot-disks image on CD$N"
-	mkdir -p boot$N/boot
-	cp $THISTYPE/boot.img boot$N/boot/
-	echo -n "-cache-inodes -J -l -b boot/boot.img " >> $N.mkisofs_opts
-    else
-	mkdir boot$N
-	echo -n "-cache-inodes -J -l " >> $N.mkisofs_opts
-    fi
-fi
-
-case "$MKISOFS" in
-    *xorriso*)
-	;;
-    *)
-	"$BASEDIR/tools/sorting_weights" "$N" boot$N/isolinux/isolinux.bin boot$N/isolinux/boot.cat
-	echo -n "-sort $(pwd)/$N.weights " >> $N.mkisofs_opts
-	;;
-esac
-
-# Only disk one gets the extra files installed
-#
-if [ "$NN" = "1" ]; then
-
-
-HIDDEN_TIMEOUT=
-if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
-    case $PROJECT in
-	mythbuntu)
-	    HIDDEN_TIMEOUT=1
-	    ;;
-	lubuntu)
-	    # Lubuntu appears to be an exception, being a live image but not
-	    # using hidden timeout.
-	    ;;
-	*)
-	    HIDDEN_TIMEOUT=2
-	    ;;
-    esac
-    if [ -e "$BASEDIR/data/$DI_CODENAME/$PROJECT-access.pcx" ]; then
-	ACCESSPCX="$PROJECT-access.pcx"
-    else
-	ACCESSPCX=access-new.pcx
-    fi
-    if [ -e "$BASEDIR/data/$DI_CODENAME/$PROJECT-blank.pcx" ]; then
-	BLANKPCX="$PROJECT-blank.pcx"
-    else
-	BLANKPCX=blank.pcx
-    fi
-fi
-
-# populate the install directory as well
-for disk in $DISK_IMAGES; do
-	dir=$(dirname $disk)
-	mkdir -p $CDDIR/install/$dir
-	cp -lf $disk $CDDIR/install/$dir
-done
-
-if [ "$CDIMAGE_INSTALL" = 1 ]; then
-	for tar in $TAR_IMAGES; do
-		dir=$(dirname $tar)
-		mkdir -p $CDDIR/install/$dir
-		tar -C $CDDIR/install/$dir -xzpf $tar
-	done
-fi
-
-# ISOLINUX setup
-
-if [ "$CDIMAGE_INSTALL" = 1 ]; then
-    # Include Smart Boot Manager image for people where isolinux fails
-    gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
-    # Keep the original file timestamp
-    touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
-    cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
-fi
-# Extract memtest86+ from the archive
-MEMTEST86DEB="$($BASEDIR/tools/apt-selection cache show memtest86+ | \
-	grep ^Filename | awk '{print $2}')"
-dpkg --fsys-tarfile "$MIRROR/$MEMTEST86DEB" | \
-	tar xf - -C $CDDIR/install/ ./boot/memtest86+.bin
-mv $CDDIR/install/boot/memtest86+.bin $CDDIR/install/mt86plus
-rm -rf $CDDIR/install/boot
-# Isolinux help files come from d-i.
-cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
-# Override splash screen.
-if [ "$SPLASHRLE" ] && [ -e "$SPLASHRLE" ]; then
-    cp -p "$SPLASHRLE" boot$N/isolinux/splash.rle
-fi
-if [ "$GFXSPLASH" ] && [ -e "$GFXSPLASH" ]; then
-    cp -p "$GFXSPLASH" boot$N/isolinux/splash.pcx
-fi
-if [ "$SPLASHPNG" ] && [ -e "$SPLASHPNG" ]; then
-    cp -p "$SPLASHPNG" boot$N/isolinux/splash.png
-fi
-if [ "$HIDDEN_TIMEOUT" ] && [ "$ACCESSPCX" ]; then
-    cp -p "$BASEDIR/data/$DI_CODENAME/$ACCESSPCX" boot$N/isolinux/access.pcx
-fi
-if [ "$HIDDEN_TIMEOUT" = 2 ]; then
-    cp -p "$BASEDIR/data/$DI_CODENAME/$BLANKPCX" boot$N/isolinux/blank.pcx
-fi
-if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
-    # No language menu.
-    echo en >boot$N/isolinux/lang
-elif [ "$PROJECT" = ubuntukylin ]; then
-    echo zh_CN >boot$N/isolinux/lang
-fi
-# Remove elilo configuration; only for Macs.
-rm -f boot$N/isolinux/elilo*
-rm -f boot$N/isolinux/*.msg*
-if [ "$CDIMAGE_INSTALL" = 1 ]; then
-    rm -f boot$N/isolinux/*.txt.live
-    rm -f boot$N/isolinux/*.hlp.live
-else
-    for x in boot$N/isolinux/*.txt.live; do
-	[ -f "$x" ] || continue
-	mv "$x" "${x%.live}"
-    done
-    for x in boot$N/isolinux/*.hlp.live; do
-	[ -f "$x" ] || continue
-	mv "$x" "${x%.live}"
-    done
-fi
-# Nuke the GTK menu items for now.
-rm -f boot$N/isolinux/*gtk.cfg
-rm -f boot$N/isolinux/*.txt.withgtk
-# We only support single-architecture images.
-sed -i 's|%install%|install|' boot$N/isolinux/*.cfg
-# Move GRUB files to the right place.
-mkdir -p $CDDIR/EFI/BOOT
-mcopy -i boot$N/isolinux/grub/efi.img ::EFI/BOOT/BOOTx64.EFI $CDDIR/EFI/BOOT/BOOTx64.EFI
-mcopy -i boot$N/isolinux/grub/efi.img ::EFI/BOOT/grubx64.efi $CDDIR/EFI/BOOT/grubx64.efi
-mcopy -i boot$N/isolinux/grub/efi.img ::EFI/BOOT/mmx64.efi $CDDIR/EFI/BOOT/mmx64.efi
-mkdir -p $CDDIR/boot/grub
-mv boot$N/isolinux/grub/* $CDDIR/boot/grub/
-rmdir boot$N/isolinux/grub
-sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
-
-if [ "$BACKPORT_KERNEL" ]; then
-    cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
-submenu 'Boot and Install with the HWE kernel' {
-EOF
-    : > boot$N/isolinux/hwe-gfxboot.cfg
-fi
-
-# Menu timeout, in seconds.
-# gfxboots will need it in deciseconds (it is converted as needed)
-menu_timeout=30
-
-# When using hidden timeout; use a shorter timeout while the user
-# only sees the accessibility logo at the bottom of the screen.
-if [ "$HIDDEN_TIMEOUT" ]; then
-    menu_timeout=5
-fi
-
-# Set timeout for the GRUB menu
-cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-set timeout=$menu_timeout
-EOF
-
-# Set gfxboot timeouts (for hidden-timeout or for the language picker)
-sed -i "s/^timeout .*/timeout $(($menu_timeout * 10))/" \
-    boot$N/isolinux/isolinux.cfg boot$N/isolinux/prompt.cfg
-
-# Set up-to-date build dates. Kludgy because d-i sets its own version as
-# the build date.
-DI_VERSION="$(perl -lne 'if (/built on ([0-9a-z]*)/) { print $1 }' \
-			"boot$N/isolinux/f1.txt")"
-if [ "$DI_VERSION" ]; then
-    : "${CDIMAGE_DATE:=$(date +%Y%m%d)}"
-    sed -i "s/$DI_VERSION/$CDIMAGE_DATE/g" \
-	"boot$N"/isolinux/*.txt "boot$N"/isolinux/*.hlp
-fi
-
-# Isolinux config file.
-if [ "$CDIMAGE_LIVE" = 1 ]; then
-    DEFAULT_LABEL=live
-else
-    DEFAULT_LABEL=install
-fi
-cat > boot$N/isolinux/txt.cfg <<EOF
-default $DEFAULT_LABEL
-EOF
-> boot$N/isolinux/adtxt.cfg
-if [ "$GFXBOOT" ]; then
-    cat >> boot$N/isolinux/isolinux.cfg <<EOF
-ui gfxboot bootlogo
-EOF
-fi
-if [ "$PROJECT" = ubuntu ] || [ "$PROJECT" = ubuntu-server ] || \
-   [ "$PROJECT" = ubuntu-mid ] || [ "$PROJECT" = ubuntu-netbook ] || \
-   [ "$PROJECT" = mythbuntu ] || [ "$PROJECT" = ubuntukylin ] || \
-   [ "$PROJECT" = ubuntu-desktop-next ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xFFFFFF
-background=0x958490
-screen-colour=0x270A1E
-EOF
-fi
-if [ "$PROJECT" = ubuntu-gnome ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-screen-colour=0x2D3335
-EOF
-fi
-if [ "$PROJECT" = ubuntu-budgie ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xffffff
-background=0xd3dae3
-screen-colour=0x383c4a
-EOF
-fi
-if [ "$PROJECT" = ubuntu-mate ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xffffff
-background=0x87a556
-screen-colour=0x3c3b37
-EOF
-fi
-if [ "$HIDDEN_TIMEOUT" ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-hidden-timeout=$HIDDEN_TIMEOUT
-EOF
-fi
-# access-options default: v1 v2 v3 brltty m1 m2
-# d-i only supports v1 and brltty right now.
-if [ "$CDIMAGE_LIVE" != 1 ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-access-options=v1 brltty
-access-options-v1=access=v1 FRONTEND_BACKGROUND=dark
-EOF
-elif [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-access-options=v1 v2 brltty m1
-EOF
-elif [ "$PROJECT" = xubuntu ]; then
-    # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-access-options=v2 v3 brltty m2
-EOF
-fi
-cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label normal=Normal
-append normal=
-EOF
-if [ "$CDIMAGE_LIVE" = 1 ]; then
-    QUIET=quiet
-    SPLASH=splash
-    case "$PROJECT" in
-        kubuntu|kubuntu-plasma5)
-            livelabel="^Start $HUMANPROJECT"
-            liveparams=' maybe-ubiquity'
-            NOTRYONLYDO=true
-            ;;
-        lubuntu)
-            livelabel="^Start $HUMANPROJECT"
-            liveparams=
-            NOTRYONLYDO=true
-            ;;
-        ubuntu-server)
-            livelabel="^Install $HUMANPROJECT"
-            liveparams=
-            SPLASH=
-            NOTRYONLYDO=true
-            ;;
-        ubuntu-mid)
-            livelabel="^Try $HUMANPROJECT without installing"
-            liveparams=
-            NOTRYONLYDO=true
-            ;;
-        ubuntu)
-            livelabel="^Try $HUMANPROJECT without installing"
-            liveparams=
-            livelabelgrub="^$HUMANPROJECT"
-            liveparamsgrub=' maybe-ubiquity'
-            NOTRYONLYDOINGRUB=true
-            ;;
-        *)
-            livelabel="^Try $HUMANPROJECT without installing"
-            liveparams=
-    esac
-
-    if [ -z "$livelabelgrub" ]; then
-        livelabelgrub="$livelabel"
-        liveparamsgrub="$liveparams"
-    fi
-    
-    
-    LAYERFS_PATH_OPT=$(add_layerfs_path_opt)
-
-for variant in "" " (safe graphics)^ nomodeset"; do
-    suffix="${variant%^*}"
-    extra_kopt="${variant#*^}"
-    cat >> boot$N/isolinux/txt.cfg <<EOF
-label live$(echo "${extra_kopt}"|tr ' ' '-')
-  menu label ${livelabel}${suffix}
-  kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
-EOF
+# Currently only server is built with HWE, hence no safe-graphics/OEM
+if [ "$HWE" ]; then
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "${livelabelgrub#^}${suffix}" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
-	initrd	$CASPER_INITRD
-}
-EOF
-done
-    cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "${livelabelgrub#^}" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
-	initrd	$CASPER_INITRD
-}
-EOF
-    if [ "$NOTRYONLYDO" != "true" ]; then
-	for variant in "" " (safe graphics)^ nomodeset"; do
-	    suffix="${variant%^*}"
-	    extra_kopt="${variant#*^}"
-	    cat >> boot$N/isolinux/txt.cfg <<EOF
-label live-install$(echo "${extra_kopt}"|tr ' ' '-')
-  menu label ^Install $HUMANPROJECT${suffix}
-  kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
-EOF
-        if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
-	    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "Install $HUMANPROJECT${suffix}" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
-	initrd	$CASPER_INITRD
-}
-EOF
-        fi
-	done
-    if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
-	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "Install $HUMANPROJECT" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
-	initrd	$CASPER_INITRD
-}
-EOF
-    fi
-    fi
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label driverupdates=Use driver update disc
-append driverupdates=debian-installer/driver-update=true
-applies driverupdates=live live-install live-nomodeset live-install-nomodeset
-EOF
-fi
-if [ "$CDIMAGE_INSTALL" = 1 ]; then
-    if [ "$CDIMAGE_LIVE" != 1 ]; then
-    for kp in $KERNEL_PREFIXES; do
-	cat >> boot$N/isolinux/txt.cfg <<EOF
-label ${!kp}install
-  menu label ^Install $HUMANPROJECT${!kp:+ with the HWE kernel}
-  kernel /install/${!kp}vmlinuz
-  append $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} vga=788 initrd=/install/${!kp}initrd.gz quiet ---
-EOF
-	cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Install $HUMANPROJECT" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    done
-    else
-	cat >> boot$N/isolinux/txt.cfg <<EOF
-label install
-  menu label ^Install $HUMANPROJECT in text mode
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
-EOF
-	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "Install $HUMANPROJECT in text mode" {
-	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
-	initrd	/install/initrd.gz
-}
-EOF
-    fi
-    cat >> boot$N/isolinux/adtxt.cfg <<EOF
-label expert
-  menu hide
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
-EOF
-    if [ "$PROJECT" = edubuntu ]; then
-	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label workstation=Install a workstation
-replace workstation=file=/cdrom/preseed/workstation.seed
-applies workstation=install
-EOF
-    fi
-    if [ "$CDIMAGE_DVD" = 1 ] && [ "$PROJECT" != edubuntu ] && [ "$PROJECT" != ubuntu-server ]; then
-	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label server=Install a server
-replace server=file=/cdrom/preseed/ubuntu-server.seed
-applies server=install
-EOF
-    fi
-fi
-# No OEM mode on ubuntu-server live
-if ! ([ "$PROJECT" = ubuntu-server ] && [ "$CDIMAGE_LIVE" = 1 ]); then
-# The GRUB versions of this only correspond to single isolinux labels,
-# because we don't yet have the necessary technology in our GRUB menu stack
-# to have a two-dimensional set of boot options, as is implemented for
-# isolinux using the gfxboot "applies" keyword.
-for kp in $KERNEL_PREFIXES; do
-cat >> boot$N/isolinux/${!kp}gfxboot.cfg <<EOF
-label ${!kp}oem=OEM install (for manufacturers)
-append ${!kp}oem=oem-config/enable=true
-EOF
-if [ "$CDIMAGE_LIVE" = 1 ]; then
-    cat >> boot$N/isolinux/${!kp}gfxboot.cfg <<EOF
-applies ${!kp}oem=live live-install install live-nomodeset live-install-nomodeset
-EOF
-    cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "OEM install (for manufacturers)" {
-	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}}$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
-	initrd	$CASPER_INITRD
-}
-EOF
-else
-    cat >> boot$N/isolinux/${!kp}gfxboot.cfg <<EOF
-applies ${!kp}oem=${!kp}install
-EOF
-    cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "OEM install (for manufacturers)" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} quiet oem-config/enable=true ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-fi
-done
-fi # No OEM mode on ubuntu-server live
-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    if [ "$PROJECT" != ubuntu-server ]; then
-	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label cli=Install a command-line system
-replace cli=file=/cdrom/preseed/cli.seed
-applies cli=install
-EOF
-    else
-    for kp in $KERNEL_PREFIXES; do
-	cat >> boot$N/isolinux/${!kp}gfxboot.cfg <<EOF
-label ${!kp}minimal=Install a minimal system
-replace ${!kp}minimal=file=/cdrom/preseed/${!kp}ubuntu-server-minimal.seed
-applies ${!kp}minimal=${!kp}install
-label ${!kp}minimalvm=Install a minimal virtual machine
-replace ${!kp}minimalvm=file=/cdrom/preseed/${!kp}ubuntu-server-minimalvm.seed
-applies ${!kp}minimalvm=${!kp}install
-EOF
-    done
-    fi
-fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label ltsp=Install an LTSP server
-replace ltsp=file=/cdrom/preseed/ltsp.seed
-applies ltsp=install
-EOF
-fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && [ "$PROJECT" = mythbuntu ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-label ltsp=Install a Diskless Image Server
-replace ltsp=file=/cdrom/preseed/ltsp.seed
-applies ltsp=install
-EOF
-fi
-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    cat >> boot$N/isolinux/txt.cfg <<EOF
-label check
-  menu label ^Check disc for defects
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
-EOF
-    for kp in $KERNEL_PREFIXES; do
-    cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Check disc for defects" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    done
-fi
-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    cat >> boot$N/isolinux/adtxt.cfg <<EOF
-label rescue
-  menu label ^Rescue a broken system
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
-EOF
-    for kp in $KERNEL_PREFIXES; do
-    cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Rescue a broken system" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS rescue/enable=true ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    done
-fi
-cat >> boot$N/isolinux/txt.cfg <<EOF
-label memtest
-  menu label Test ^memory
-  kernel /install/mt86plus
-label hd
-  menu label ^Boot from first hard disk
-  localboot 0x80
-EOF
-cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "Test memory" {
-	linux16	/install/mt86plus
-}
-EOF
+menuentry "$HUMANPROJECT with the HWE kernel" {
+	set gfxpayload=keep
+	linux	/casper/hwe-vmlinuz $KERNEL_PARAMS
+	initrd	/casper/hwe-initrd
+}
+EOF
+fi
+
+# UEFI Entries
 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 grub_platform
 if [ "\$grub_platform" = "efi" ]; then
@@ -699,40 +104,5 @@
 }
 fi
 EOF
-fi
-
-if [ "$BACKPORT_KERNEL" ] && [ "$PROJECT" = ubuntu-server ]; then
-    cat >> $CDDIR/boot/grub/hwe-grub.cfg <<EOF
-}
-EOF
-    cat $CDDIR/boot/grub/hwe-grub.cfg >> $CDDIR/boot/grub/grub.cfg
-    cat boot$N/isolinux/hwe-gfxboot.cfg >> boot$N/isolinux/gfxboot.cfg
-fi
-rm -f $CDDIR/boot/grub/hwe-grub.cfg boot$N/isolinux/hwe-gfxboot.cfg
-
-# write final lines to mkisofs_opts
-if [ "$NN" = "1" ]; then
-    echo -n "boot$N " >> $N.mkisofs_opts
-else
-    if [ -n "$THISTYPE" ]; then
-	echo -n "-c boot/boot.catalog boot$N "  >> $N.mkisofs_opts
-    fi
-fi
-
-# Hack around the removal of support in gfxboot for reading from outside
-# the bootlogo archive.  This makes customisation harder and is not ideal.
-tmpdir="$(mktemp -d)"
-(cd "$tmpdir" && cpio -i) < boot$N/isolinux/bootlogo
-cp -a boot$N/isolinux/*.fnt \
-      boot$N/isolinux/*.hlp \
-      boot$N/isolinux/*.jpg \
-      boot$N/isolinux/*.pcx \
-      boot$N/isolinux/*.tr \
-      boot$N/isolinux/*.cfg \
-      $(test -e boot$N/isolinux/lang && echo boot$N/isolinux/lang) \
-      boot$N/isolinux/langlist \
-      "$tmpdir/"
-(cd "$tmpdir" && ls -1 | cpio --quiet -o) > boot$N/isolinux/bootlogo
-rm -rf "$tmpdir"
 
 # th,th, thats all
 
=== modified file 'tools/boot/groovy/common.sh'
--- tools/boot/groovy/common.sh	2020-05-21 21:59:34 +0000
+++ tools/boot/groovy/common.sh	2020-06-19 13:49:32 +0000
@@ -1,3 +1,35 @@
+# encode the right CD kernel parameteres, for every project
+default_kernel_params() {
+    case $PROJECT in
+        ubuntu)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
+            ;;
+        ubuntukylin)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed locale=zh_CN keyboard-configuration/layoutcode?=cn maybe-ubiquity quiet splash --- "
+            ;;
+        kubuntu)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/kubuntu.seed maybe-ubiquity quiet splash --- "
+            ;;
+        lubuntu)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/lubuntu.seed quiet splash --- "
+            ;;
+        xubuntu)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/xubuntu.seed maybe-ubiquity quiet splash --- "
+            ;;
+        ubuntustudio)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntustudio.seed maybe-ubiquity quiet splash --- "
+            ;;
+        ubuntu-mate)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu-mate.seed maybe-ubiquity quiet splash --- "
+            ;;
+        ubuntu-budgie)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu-budgie.seed maybe-ubiquity quiet splash --- "
+            ;;
+        ubuntu-server)
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }quiet ---"
+            ;;
+    esac
+}
 
 # This file provides some common code that is intented to be called
 # by the various boot-<arch> scripts.