From 17a865e064f1bd994e4e69df70447ba6eb99fe5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Tue, 27 Nov 2018 10:47:22 +0100 Subject: [PATCH] Skip linux-image-extra-$(uname -r) on 18.04 Seems like aforementioned package is not available on Ubuntu 18.04 (Bionic). This commit excludes that version from installation of Docker. Change-Id: Ib1864497dd19caadf9077386ce278712e4f5de8f --- devstack/lib/docker | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/devstack/lib/docker b/devstack/lib/docker index dc72d34..4a807ac 100644 --- a/devstack/lib/docker +++ b/devstack/lib/docker @@ -49,10 +49,12 @@ function install_docker { local dist_version=${os_CODENAME} local arch=$(dpkg --print-architecture) if is_ubuntu; then - if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then - apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual - else - (>&2 echo "WARNING: Current kernel is not supported by the linux-image-extra-virtual package. Docker may not work.") + if [[ ${dist_version} == 'trusty' ]]; then + if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then + apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual + else + (>&2 echo "WARNING: Current kernel is not supported by the linux-image-extra-virtual package. Docker may not work.") + fi fi apt_get install apt-transport-https ca-certificates software-properties-common curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -