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

ubuntu/zesty
Łukasz 'sil2100' Zemczak 7 years ago
parent 456677fa30
commit 5edadd437a

8
debian/changelog vendored

@ -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 <lukasz.zemczak@ubuntu.com> Wed, 08 Nov 2017 12:32:35 +0100
livecd-rootfs (2.441.8) zesty; urgency=medium livecd-rootfs (2.441.8) zesty; urgency=medium
[ Robert C Jennings ] [ Robert C Jennings ]

@ -148,6 +148,9 @@ case $IMAGEFORMAT in
OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT"
;; ;;
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)
@ -773,6 +776,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