[Merge] ~rbalint/livecd-rootfs:wsl into livecd-rootfs:ubuntu/master

[Balint Reczey]

Diff comments:

> diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/base b/live-build/ubuntu-cpc/hooks.d/base/series/base
> index 4326257..f04bdec 100644
> --- a/live-build/ubuntu-cpc/hooks.d/base/series/base
> +++ b/live-build/ubuntu-cpc/hooks.d/base/series/base
> @@ -5,3 +5,4 @@ depends disk-image
>  depends qcow2
>  depends vmdk
>  depends vagrant
> +depends wsl

I think I'm missing something here, this seems to be the base file.

> diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/wsl b/live-build/ubuntu-cpc/hooks.d/base/series/wsl
> new file mode 100644
> index 0000000..134c81e
> --- /dev/null
> +++ b/live-build/ubuntu-cpc/hooks.d/base/series/wsl
> @@ -0,0 +1 @@

Indeed, fixing.

> +base/wsl.binary
> diff --git a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary
> new file mode 100755
> index 0000000..568cab6
> --- /dev/null
> +++ b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary
> @@ -0,0 +1,45 @@
> +#!/bin/bash -ex

Fixing it.

> +# vi: ts=4 expandtab
> +#
> +# Generate the compressed root directory for WSL
> +
> +case ${SUBPROJECT:-} in
> +    minimized)
> +        echo "Skipping minimized $0 build as WSL systems are designed to be interactive"
> +        exit 0
> +        ;;
> +    *)
> +        ;;
> +esac
> +
> +case $ARCH in
> +    amd64|arm64)
> +        ;;
> +    *)
> +        echo "WSL root tarballs are not generated for $ARCH."
> +        exit 0;;
> +esac
> +
> +if [ -n "$SUBARCH" ]; then
> +    echo "Skipping rootfs build for subarch flavor build"
> +    exit 0
> +fi
> +
> +. config/functions
> +
> +rootfs_dir=wslroot.dir
> +
> +# This is the directory created by create-root-dir.binary
> +cp -a rootfs.dir $rootfs_dir
> +
> +setup_mountpoint $rootfs_dir
> +
> +env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
> +
> +teardown_mountpoint $rootfs_dir

Fixing.

> +
> +# remove attributes not supported by WSL's tar
> +setfattr -x system.posix_acl_access $rootfs_dir/var/log/journal
> +setfattr -x system.posix_acl_default $rootfs_dir/var/log/journal
> +
> +(cd $rootfs_dir/ && tar -c --sort=name --xattrs *) | gzip > ubuntu-wsl.rootfs.tar.gz

Yes, I already fixed those in the WIP version.



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