Import patches-unapplied version 2.501 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 7ae099a88b73276b8da9f609fdc355469d33b01b

New changelog entries:
  * Stop building ova, vmdk, vagrant images on i386.
This commit is contained in:
Dimitri John Ledkov 2018-02-12 11:24:49 +00:00 committed by usd-importer
parent 7ae099a88b
commit 3b7b54098b
4 changed files with 7 additions and 9 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.501) bionic; urgency=medium
* Stop building ova, vmdk, vagrant images on i386.
-- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 12 Feb 2018 11:24:49 +0000
livecd-rootfs (2.500) bionic; urgency=medium
* Disable the snapd.refresh.timer in the live server session.

View File

@ -4,7 +4,7 @@
# Generate VMDK files
case $ARCH in
i386|amd64) ;;
amd64) ;;
*) echo "VMDK images are not supported for $ARCH yet.";
exit 0;;
esac

View File

@ -18,10 +18,6 @@ case $ARCH in
ovf_id=94
ovf_os_type="ubuntu64Guest"
ovf_desc_bits=64 ;;
i386)
ovf_id=93
ovf_os_type="ubuntu32Guest"
ovf_desc_bits=32 ;;
*)
echo "OVA images are not supported for $ARCH yet.";
exit 0;;

View File

@ -35,10 +35,6 @@ case $ARCH in
ovf_id=94
ovf_os_type="ubuntu64Guest"
ovf_desc_bits=64 ;;
i386)
ovf_id=93
ovf_os_type="ubuntu32Guest"
ovf_desc_bits=32 ;;
*)
echo "Vagrant images are not supported for $ARCH yet."
exit 0;;