[Merge] ~dbungert/livecd-rootfs:ubuntu-mini-iso into livecd-rootfs:ubuntu/master

[Łukasz Zemczak]

Review: Needs Fixing

I still didn't manage to fully run this successfully. We might want to slim down some things here, as for instance I see that there's a lot going on with creating the rootfs tarball, which I don't think is actually consumed?

Anyway, two things that need fixing though:
1) Inline commend
2) In auto/config:

diff --git a/live-build/auto/config b/live-build/auto/config
index ecced5f4..1a672c81 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1380,7 +1380,7 @@ EOF
                fi
                ;;
 
-       ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
+       ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*|ubuntu-mini-iso:*)
                # Ensure that most things e.g. includes.chroot are copied as is
                for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
                        case $entry in


Diff comments:

> diff --git a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
> new file mode 100755
> index 0000000..88de5e1
> --- /dev/null
> +++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
> @@ -0,0 +1,48 @@
> +#!/bin/sh
> +
> +case $PASS in

In my testing, PASS wasn't 'ubuntu-mini-iso', so this was never executed. I don't think looking at the pass here also is necessary? If there's no explicit reason, I'd just remove this check here.

> +    ubuntu-mini-iso)
> +        ;;
> +    *)
> +        exit 0
> +        ;;
> +esac
> +
> +case $ARCH in
> +    amd64)
> +        ;;
> +    *)
> +        exit 0
> +        ;;
> +esac
> +
> +set -eux
> +
> +KERNEL=chroot/boot/vmlinuz
> +INITRD=chroot/boot/initrd.img
> +
> +mkdir -p "ubuntu-mini-iso/$ARCH"
> +
> +case $ARCH in
> +    amd64)
> +        cp -a chroot/usr/share/cd-boot-images-amd64/tree ubuntu-mini-iso/amd64/tree
> +        cp -a chroot/usr/share/cd-boot-images-amd64/images ubuntu-mini-iso/amd64/images
> +        cp "$KERNEL" ubuntu-mini-iso/amd64/linux
> +        cp "$INITRD" ubuntu-mini-iso/amd64/initrd
> +        cat > ubuntu-mini-iso/amd64/grub/grub.cfg <<EOF
> +menuentry "Choose an Ubuntu version to install" {
> +        set gfxpayload=keep
> +        linux /casper/vmlinuz iso-chooser-menu ip=dhcp ---
> +        initrd /casper/initrd
> +}
> +EOF
> +        ;;
> +esac
> +
> +dest="${PWD}/livecd.${PROJECT}.ubuntu-mini.iso"
> +xorriso="$(cat chroot/usr/share/cd-boot-images-amd64/xorriso-cmd.txt)"
> +
> +cd ubuntu-mini-iso
> +bash -c "$xorriso -o $dest"
> +cd ..
> +rm -rf ubuntu-mini-iso


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