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

[Łukasz Zemczak]

Review: Needs Fixing

This looks conceptually good, and I think everything works as expected. There's one little thing marked inline that needs to be fixed though. NOW is also missing in local builds, but that is fine as I see buildd seems to set that for us IIRC.

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..47b46f9
> --- /dev/null
> +++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
> @@ -0,0 +1,77 @@
> +#!/bin/sh
> +
> +set -eu
> +
> +case $ARCH in
> +    amd64)
> +        ;;
> +    *)
> +        exit 0
> +        ;;
> +esac
> +
> +KERNEL=chroot/boot/vmlinuz
> +INITRD=chroot/boot/initrd.img
> +
> +mkdir -p "chroot/etc/initramfs-tools/conf.d"
> +cat > chroot/etc/initramfs-tools/conf.d/casperize.conf <<EOF
> +export CASPER_GENERATE_UUID=1
> +EOF
> +
> +chroot chroot update-initramfs -u
> +
> +case $ARCH in
> +    amd64)
> +        mkdir -p "ubuntu-mini-iso/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
> +        mkdir -p "ubuntu-mini-iso/amd64/tree/casper"
> +        cp "$KERNEL" ubuntu-mini-iso/amd64/tree/casper/vmlinuz
> +        cp "$INITRD" ubuntu-mini-iso/amd64/tree/casper/initrd
> +        mkdir -p "ubuntu-mini-iso/amd64/tree/boot/grub"
> +        cat > ubuntu-mini-iso/amd64/tree/boot/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
> +
> +mkdir -p ubuntu-mini-iso/$ARCH/tree/.disk
> +
> +touch ubuntu-mini-iso/$ARCH/tree/.disk/base_installable
> +
> +tmpdir=$(mktemp -d)
> +unmkinitramfs $INITRD $tmpdir
> +if [ -e "$tmpdir/main/conf/uuid.conf" ]; then
> +    uuid_conf="$tmpdir/main/conf/uuid.conf"
> +elif [ -e "$tmpdir/conf/uuid.conf" ]; then
> +    uuid_conf="$tmpdir/conf/uuid.conf"
> +else
> +    echo "uuid.conf not found"
> +    exit 1
> +fi
> +cp "$uuid_conf" ubuntu-mini-iso/$ARCH/tree/.disk/casper-uuid-generic
> +rm -fr $tmpdir
> +
> +cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <<EOF
> +full_cd/single
> +EOF
> +
> +version=$(distro-info --fullname --series=$SUITE \
> +          | sed s'/^Ubuntu/ubuntu-mini-iso/')
> +
> +cat > ubuntu-mini-iso/$ARCH/tree/.disk/info <<EOF
> +$version - $OFFICIAL $ARCH ($NOW)

Where is $OFFICIAL defined? I don't see it used anywhere, it also doesn't seem to be passed to the livefs build via launchpad-buildd. Right now when doing a local build this causes the build to fail. This is only used in debian-cd.

> +EOF
> +
> +dest="${PWD}/livecd.${PROJECT}.ubuntu-mini.iso"
> +xorriso="$(cat chroot/usr/share/cd-boot-images-amd64/xorriso-cmd.txt)"
> +
> +cd ubuntu-mini-iso/$ARCH
> +$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.