Backport Gary's commit adding the IMAGEFORMAT=none to support generating a single rootfs.

ubuntu/artful
Łukasz 'sil2100' Zemczak 7 years ago
parent 8991c5cb41
commit 499e047e9e

8
debian/changelog vendored

@ -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 <lukasz.zemczak@ubuntu.com> Wed, 08 Nov 2017 12:02:04 +0100
livecd-rootfs (2.478) artful; urgency=medium livecd-rootfs (2.478) artful; urgency=medium
[ Michael Hudson-Doyle ] [ Michael Hudson-Doyle ]

@ -183,6 +183,9 @@ case $IMAGEFORMAT in
exit 0 exit 0
;; ;;
none)
OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
;;
*) *)
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-touch|ubuntu-touch-custom) 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) 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}/* \ cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
config/ config/
if [ "$IMAGEFORMAT" = none ]; then
rm -f config/hooks/*.binary*
fi
;; ;;
esac esac

Loading…
Cancel
Save