diff --git a/diskimage-create/README.rst b/diskimage-create/README.rst index abf7649caa..d57a9ebf77 100644 --- a/diskimage-create/README.rst +++ b/diskimage-create/README.rst @@ -103,7 +103,7 @@ Command syntax: [-a i386 | **amd64** | armhf | ppc64le ] [-b **haproxy** ] [-c **~/.cache/image-create** | ] - [-d **xenial**/**7** | trusty | 8 | ] + [-d **bionic**/**7** | xenial | 8 | ] [-e] [-f] [-h] @@ -123,7 +123,7 @@ Command syntax: '-a' is the architecture type for the image (default: amd64) '-b' is the backend type (default: haproxy) '-c' is the path to the cache directory (default: ~/.cache/image-create) - '-d' distribution release id (default on ubuntu: xenial) + '-d' distribution release id (default on ubuntu: bionic) '-e' enable complete mandatory access control systems when available (default: permissive) '-f' disable tmpfs for build '-h' display help message diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index e0d4f1baa8..2d708cf7c8 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -23,7 +23,7 @@ usage() { echo " [-a i386 | **amd64** | armhf | ppc64le]" echo " [-b **haproxy** ]" echo " [-c **~/.cache/image-create** | ]" - echo " [-d **xenial**/**7** | trusty | 8 | ]" + echo " [-d **bionic**/**7** | xenial | 8 | ]" echo " [-e]" echo " [-f]" echo " [-h]" @@ -43,7 +43,7 @@ usage() { echo " '-a' is the architecture type for the image (default: amd64)" echo " '-b' is the backend type (default: haproxy)" echo " '-c' is the path to the cache directory (default: ~/.cache/image-create)" - echo " '-d' distribution release id (default on ubuntu: xenial)" + echo " '-d' distribution release id (default on ubuntu: bionic)" echo " '-e' enable complete mandatory access control systems when available (default: permissive)" echo " '-f' disable tmpfs for build" echo " '-h' display this help message" @@ -207,7 +207,7 @@ AMP_CACHEDIR=${AMP_CACHEDIR:-"$HOME/.cache/image-create"} AMP_BASEOS=${AMP_BASEOS:-"ubuntu-minimal"} if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then - export DIB_RELEASE=${AMP_DIB_RELEASE:-"xenial"} + export DIB_RELEASE=${AMP_DIB_RELEASE:-"bionic"} elif [ "${AMP_BASEOS}" = "centos" ] || [ "${AMP_BASEOS}" = "rhel" ]; then export DIB_RELEASE=${AMP_DIB_RELEASE:-"7"} elif [ "${AMP_BASEOS}" = "fedora" ]; then