[Merge] lp:~daniel-thewatkins/livecd-rootfs/trunk into lp:livecd-rootfs

[Adam Conrad]

A few inline comments, but mostly +1ish.  Respond with either code or words, and we're good to go.

Diff comments:

> 
> === renamed file 'live-build/ubuntu-cpc/hooks/031-root-xz.binary' => 'live-build/ubuntu-cpc/hooks/031-1-root-xz.binary' (properties changed: -x to +x)
> --- live-build/ubuntu-cpc/hooks/031-root-xz.binary	2018-06-06 23:04:45 +0000
> +++ live-build/ubuntu-cpc/hooks/031-1-root-xz.binary	2018-06-07 21:23:42 +0000
> @@ -10,20 +10,8 @@
>  
>  . config/functions

You don't include config/functions in root-squashfs.binary, but you do here.  Which is it?  Seems like you don't need it in either place?

>  
> -tardir=filesystem.dir
> -mkdir $tardir
> -cp -a chroot/* $tardir
> -
> -setup_mountpoint $tardir
> -
> -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
> -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^grub-.*'
> -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get autoremove --purge --assume-yes
> -
> -teardown_mountpoint $tardir
> -
> -dpkg-query --admindir=$tardir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest
> -
> -(cd "$tardir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz"
> -
> -rm -rf $tardir
> +# This is the directory created by 031-0-create-root-dir.binary
> +rootfs_dir=rootfs.dir
> +
> +cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
> +(cd "$rootfs_dir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz"
> 
> === renamed file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary' => 'live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary'
> --- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2018-04-24 16:01:44 +0000
> +++ live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary	2018-06-07 21:23:42 +0000
> @@ -17,33 +17,13 @@
>  	exit 0
>  fi
>  
> -. config/functions
> -
> -mkdir binary/boot/squashfs.dir
> -cp -a chroot/* binary/boot/squashfs.dir
> -
> -setup_mountpoint binary/boot/squashfs.dir
> -
> -chroot binary/boot/squashfs.dir dpkg-divert --local --rename /usr/sbin/grub-probe
> -chroot binary/boot/squashfs.dir touch /usr/sbin/grub-probe
> -chroot binary/boot/squashfs.dir chmod +x /usr/sbin/grub-probe
> -
> -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
> -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^grub-.*'
> -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes
> -rm -rf binary/boot/squashfs.dir/boot/grub
> -chroot binary/boot/squashfs.dir mkdir -p /lib/modules

I think you determined that the /lib/modules madness was no longer required.  Are you positive the /boot/grub cleanup is also no longer a thing we need (ie: grub now correctly purges)?

> -
> -chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe
> -chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe
> -
> -teardown_mountpoint binary/boot/squashfs.dir
> +# This is the directory created by 031-0-create-root-dir.binary
> +rootfs_dir=rootfs.dir
>  
>  squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"
> -squashfs_f_manifest="${squashfs_f}.manifest"
> -
> -dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest}
> -
> -(cd "binary/boot/squashfs.dir/" &&
> +
> +cp $rootfs_dir.manifest "${squashfs_f}.manifest"

Well job on the inconsistent quoting (happens below too).  Not that I care, but lolz?

> +
> +(cd "$rootfs_dir" &&
>        mksquashfs . ${squashfs_f} \
>          -no-progress -xattrs -comp xz )


-- 
https://code.launchpad.net/~daniel-thewatkins/livecd-rootfs/trunk/+merge/347628
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~daniel-thewatkins/livecd-rootfs/trunk into lp:livecd-rootfs.