[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:live-server-kernel-futzing into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Fixing

minor changes/questions only

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 7224cf0..b14afdd 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,13 @@
> +livecd-rootfs (2.551~ppa1) disco; urgency=medium

fix?

> +
> +  * Changes to kernel handling for live-server: do not include kernel/initrd
> +    in filesystem.squashfs but rather install it in a throwaway layer on top
> +    of installer.squashfs and fish kernel, initrd and modules out of that with
> +    an initrd hook that records kernel metapackage name in /run and mounts
> +    /lib/modules from a squashfs on the ISO.
> +
> + -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Fri, 30 Nov 2018 14:13:20 +1300
> +
>  livecd-rootfs (2.550) UNRELEASED; urgency=medium
>  
>    * Fix typo preventing builds of ubuntu-core images.
> diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
> index bab6ab7..63edba4 100755
> --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
> +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
> @@ -89,10 +87,7 @@ snaps:
>  EOF
>  '
>  
> -teardown_mountpoint "$SQUASH_ROOT"
> -
> -# Then unmount the overlay
> -umount "$SQUASH_ROOT"
> +teardown_mountpoint "$INSTALLER_ROOT"

do we no longer need this umount?

>  
>  squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
>  


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