diff --git a/debian/changelog b/debian/changelog index 23e63fb6..4e271e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.441.9) UNRELEASED; urgency=medium + + [ Gary Wang ] + * Add the IMAGEFORMAT=none to support generating a single rootfs + (LP: #1730642) + + -- Ɓukasz 'sil2100' Zemczak Wed, 08 Nov 2017 12:32:35 +0100 + livecd-rootfs (2.441.8) zesty; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/config b/live-build/auto/config index 2d2ade92..5fad0f1b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -148,6 +148,9 @@ case $IMAGEFORMAT in OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT" ;; + none) + OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT" + ;; *) case $PROJECT in ubuntu-server|ubuntu-touch|ubuntu-touch-custom) @@ -773,6 +776,9 @@ EOF ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ + if [ "$IMAGEFORMAT" = none ]; then + rm -f config/hooks/*.binary* + fi ;; esac