From 499e047e9e9e43bdc040ca71f92b739cf82bd9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 8 Nov 2017 12:30:22 +0100 Subject: [PATCH] Backport Gary's commit adding the IMAGEFORMAT=none to support generating a single rootfs. --- debian/changelog | 8 ++++++++ live-build/auto/config | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6cff81ff..856c9aa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.478.1) 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:02:04 +0100 + livecd-rootfs (2.478) artful; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index bf7435d7..092f7d07 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -183,6 +183,9 @@ case $IMAGEFORMAT in exit 0 ;; + none) + OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT" + ;; *) case $PROJECT in ubuntu-server|ubuntu-touch|ubuntu-touch-custom) @@ -834,6 +837,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