From a75c13d3017b1ab07c7d5e0eec8653f75e0a8470 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 27 Apr 2018 14:53:40 +0100 Subject: [PATCH] builder: templates: Add Ubuntu 18.04. --- builder/templates/make-template.ml | 5 +- builder/templates/ubuntu-18.04.index-fragment | 30 ++++++++++ .../templates/ubuntu-18.04.virt-install-cmd | 19 +++++++ website/download/builder/index | 30 ++++++++++ website/download/builder/index.asc | 56 ++++++++++++++----- 5 files changed, 126 insertions(+), 14 deletions(-) create mode 100644 builder/templates/ubuntu-18.04.index-fragment create mode 100644 builder/templates/ubuntu-18.04.virt-install-cmd diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml index 649197460..e74d76c88 100755 --- a/builder/templates/make-template.ml +++ b/builder/templates/make-template.ml @@ -335,6 +335,7 @@ and os_of_string os ver = | "ubuntu", "12.04" -> Ubuntu (ver, "precise") | "ubuntu", "14.04" -> Ubuntu (ver, "trusty") | "ubuntu", "16.04" -> Ubuntu (ver, "xenial") + | "ubuntu", "18.04" -> Ubuntu (ver, "bionic") | "fedora", ver -> Fedora (int_of_string ver) | "freebsd", ver -> let maj, min = parse_major_minor ver in FreeBSD (maj, min) | _ -> @@ -882,7 +883,9 @@ and os_variant_of_os ?(for_fedora = false) os arch = | Debian (ver, _), _ when ver <= 8 -> sprintf "debian%d" ver | Debian _, _ -> "debian8" (* max version known in Fedora 26 *) - | Ubuntu (ver, _), _ -> sprintf "ubuntu%s" ver + | Ubuntu (ver, _), _ when ver < "18.04" -> sprintf "ubuntu%s" ver + | Ubuntu ("18.04", _), _ -> "ubuntu17.04" + | Ubuntu _, _ -> assert false | FreeBSD (major, minor), _ -> sprintf "freebsd%d.%d" major minor ) diff --git a/builder/templates/ubuntu-18.04.index-fragment b/builder/templates/ubuntu-18.04.index-fragment new file mode 100644 index 000000000..16935646e --- /dev/null +++ b/builder/templates/ubuntu-18.04.index-fragment @@ -0,0 +1,30 @@ +[ubuntu-18.04] +name=Ubuntu 18.04 (bionic) +osinfo=ubuntu18.04 +arch=x86_64 +file=ubuntu-18.04.xz +checksum[sha512]=a6d29a4cde47837e63226454a56dca6b6adcbb7212b010b4ad5a3561e3890a45a914fb12a2c1e7a46be3ba6391469f765b083484408f4e6099642b9976e68d23 +format=raw +size=6442450944 +compressed_size=303347232 +expand=/dev/sda1 +notes=Ubuntu 18.04 (bionic) + + This is a minimal Ubuntu install. + + IMPORTANT WARNING: + It seems to be impossible to create an Ubuntu >= 14.04 image using + preseed without creating a user account. Therefore this image + contains a user account 'builder'. I have disabled it, so that + people who don't read release notes don't get caught out, but you + might still wish to delete it completely. + + This image does not contain SSH host keys. To regenerate them use: + + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. + diff --git a/builder/templates/ubuntu-18.04.virt-install-cmd b/builder/templates/ubuntu-18.04.virt-install-cmd new file mode 100644 index 000000000..b3c80e84f --- /dev/null +++ b/builder/templates/ubuntu-18.04.virt-install-cmd @@ -0,0 +1,19 @@ +# This is the virt-install command which was used to create +# the virt-builder template 'ubuntu-18.04' +# NB: This file is generated for documentation purposes ONLY! +# This script was never run, and is not intended to be run. + +'virt-install' \ + '--transient' \ + '--name=tmp-is04oapq' \ + '--ram=2048' \ + '--cpu=host' \ + '--vcpus=4' \ + '--os-variant=ubuntu17.04' \ + '--initrd-inject=/tmp/qo9qe2ck.tmp/preseed.cfg' \ + '--extra-args=auto mirror/http/proxy=http://cache.home.annexia.org:3128 console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \ + '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-is04oapq.img,size=6,format=raw' \ + '--location=http://archive.ubuntu.com/ubuntu/dists/bionic/main/installer-amd64' \ + '--serial=pty' \ + '--nographics' + diff --git a/website/download/builder/index b/website/download/builder/index index 8243389cd..ee8aabef1 100644 --- a/website/download/builder/index +++ b/website/download/builder/index @@ -1397,3 +1397,33 @@ notes=Ubuntu 16.04 (Xenial). people who don't read release notes don't get caught out, but you might still wish to delete it completely. +[ubuntu-18.04] +name=Ubuntu 18.04 (bionic) +osinfo=ubuntu18.04 +arch=x86_64 +file=ubuntu-18.04.xz +checksum[sha512]=a6d29a4cde47837e63226454a56dca6b6adcbb7212b010b4ad5a3561e3890a45a914fb12a2c1e7a46be3ba6391469f765b083484408f4e6099642b9976e68d23 +format=raw +size=6442450944 +compressed_size=303347232 +expand=/dev/sda1 +notes=Ubuntu 18.04 (bionic) + + This is a minimal Ubuntu install. + + IMPORTANT WARNING: + It seems to be impossible to create an Ubuntu >= 14.04 image using + preseed without creating a user account. Therefore this image + contains a user account 'builder'. I have disabled it, so that + people who don't read release notes don't get caught out, but you + might still wish to delete it completely. + + This image does not contain SSH host keys. To regenerate them use: + + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. + diff --git a/website/download/builder/index.asc b/website/download/builder/index.asc index 3f8ca1163..1d9927ae1 100644 --- a/website/download/builder/index.asc +++ b/website/download/builder/index.asc @@ -1400,19 +1400,49 @@ notes=Ubuntu 16.04 (Xenial). people who don't read release notes don't get caught out, but you might still wish to delete it completely. +[ubuntu-18.04] +name=Ubuntu 18.04 (bionic) +osinfo=ubuntu18.04 +arch=x86_64 +file=ubuntu-18.04.xz +checksum[sha512]=a6d29a4cde47837e63226454a56dca6b6adcbb7212b010b4ad5a3561e3890a45a914fb12a2c1e7a46be3ba6391469f765b083484408f4e6099642b9976e68d23 +format=raw +size=6442450944 +compressed_size=303347232 +expand=/dev/sda1 +notes=Ubuntu 18.04 (bionic) + + This is a minimal Ubuntu install. + + IMPORTANT WARNING: + It seems to be impossible to create an Ubuntu >= 14.04 image using + preseed without creating a user account. Therefore this image + contains a user account 'builder'. I have disabled it, so that + people who don't read release notes don't get caught out, but you + might still wish to delete it completely. + + This image does not contain SSH host keys. To regenerate them use: + + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. + -----BEGIN PGP SIGNATURE----- -iQIcBAEBAgAGBQJaC0l/AAoJEJFzj3Pht2ig8LoQAKJKLfXnhwDgWMnXlptqqsL4 -jZAcYxKCe57bMqjk1f3vgy5i+4+qx2/uQDqKQUgHJDaQMZkn6sUd2ValRkK7JLbd -sh7SEovUD7X1SpFkm0OE0XcF3Il9plvvHbn9s5ho6+QYAcA7r47FRd9SmMwNET+w -BjITLG3Ia0XnKzeyqtEzvWSwi9iOgyUDvwZKwqaLIxDR8lgpXYvHTCKx0vHY77wM -1dIsI8ASFRl2BElocYB43k0d25ZfdQ0rtmzea3JoncZAwnzFIGNcO+KY2baqCVgZ -vua7pxwgeGNfsJ9Un51A7U2vz9LrzitTDXUgm02EWzb/K1FDI6S6gVqwp+/S5M4K -OwM2iToBWfYtz1wHR6QjlRLXz3IddfT72xQwWLNYfl5r4BfHuDaKqFjNEjab8kym -jDW8ammNu3GfYtNtyIaNjGg3f+clZ/wIexiCAGsCnAAp1ZjmYKetcZL3j0mBCAQA -bWOsMOKVNCL/HimRu8ubiTmRiMKrzdJhdoRwdvoYgn6/CwrapuX5ksddh0drpEHT -neq0q/ril75EPL4wLMAJQguSXpWHcR9jd3QEECaBu/YoSUOjl86cSG0ARBhp/RI7 -lXSfFTzGc+iHEWjwOpRhA+9rMREEtoagCJdKn3daivNSiiJ0DZGD0Ce4Zq5IvfO5 -9SbIe/i/yfLajGPbvd/I -=4VgU +iQIcBAEBAgAGBQJa4ytLAAoJEJFzj3Pht2igvUsQAJ04btiohF09MOQcCL5AKXH1 +FiW9kdyFUKf2Ni+kf7ZU8dlQw2pg/sWRJr8uFN3hBqhVwFVLllC1BADO8GFxO564 +vbDtYT0enK12tsA20mDf/i12U743m9k+weJ0lDhcCH1dyxKTMmf6xXVEn7VWiFVT +vnK4QKOkHTYRLmEVX1mzhtrmDR0D447f+MyKEOTlAVszWeZTGMtjvW/nNT5drkCA +4SF3uG8lu/EH6FQEOBh4yKI8cj/SzsyVA718aB2wLACpIkyyud0ELGWhW3otHY1h +RjkrO7vsTxZSnFfx1fjIGpG97cZ02usw2Y7JKomCQRLP/GCTXCZzX+Se+KEa+8O5 +XD3EQuYTO93G4hap3G0xYK0oH2WW08tk5dhlqbDqXICXWOEsBsgsCCNYPyig+1ZP +oNff5v9Cl/XPeJcXfZooeHIQ8XRUX2+O5TDoewi0dsF0KdTKZYKvA79QNyw8IUcr +ybIO7XDFP2rbJgFTDYqkU4Y/bpDXrmcKXB+Z5hVDwbxEBaQUYHmibHaN3wETuQhc +Kgvnxeq5xVaF4T315C2AJ0s3Sda+IpG6UgqsJhjs3EljGFAemJRAme9ec5xU2QTr +Vh7LGgaXzT511x3oKqlKXk1a6wbUTAL507MVY9Cn47d6WHbYcXOfvWOPY8Bbi0Fd +uYiksNrsUhBe6WQgw3gS +=v98m -----END PGP SIGNATURE-----