[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:remove-obsolete-server-initramfs-hooks into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> index ec02cc3..e599850 100755
> --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> @@ -21,28 +21,8 @@ case $PASS in
>          ;;
>  esac
>  
> -# Add a script to record which kernel meta-package to use and to set
> -# up the /media/filesystem mount that subiquity currently depends
> -# on. It would be cleaner to do this mount in a systemd mount unit but
> -# that doesn't work because we mask the cdrom mount to avoid strange
> -# issues with the handover from the initrd to systemd in the live
> -# session. In any case, subiquity will sooner or later not require
> -# this mount to be here at all and then we can delete these mount commands.
> -
> -cat <<EOF > /etc/initramfs-tools/scripts/init-bottom/live-server
> -#!/bin/sh
> -case \$1 in
> -prereqs) exit 0;;
> -esac
> -
> -echo ${kernel_metapkg} > /run/kernel-meta-package
> -
> -mkdir -p \${rootmnt}/media/filesystem \${rootmnt}/media/full \${rootmnt}/media/minimal
> -mount -o ro -t squashfs \${rootmnt}/cdrom/casper/ubuntu-server-minimal.squashfs \${rootmnt}/media/minimal
> -mount -o ro -t squashfs \${rootmnt}/cdrom/casper/ubuntu-server-minimal.ubuntu-server.squashfs \${rootmnt}/media/full
> -mount -o ro,lowerdir=\${rootmnt}/media/full:\${rootmnt}/media/minimal -t overlay overlay \${rootmnt}/media/filesystem
> -EOF
> -chmod +x /etc/initramfs-tools/scripts/init-bottom/live-server
> +mkdir /etc/subiquity
> +echo ${kernel_metapkg} > /etc/subiquity/kernel-meta-package

This bit now happens in live-build/lb_chroot_layered so I guess this needs rebased

>  
>  cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
>  export CASPER_GENERATE_UUID=1


-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/438411
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.