Browse Source

Merge "Skip linux-image-extra-$(uname -r) on 18.04"

Zuul 4 months ago
parent
commit
7e44a59c1e
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      devstack/lib/docker

+ 6
- 4
devstack/lib/docker View File

@@ -49,10 +49,12 @@ function install_docker {
49 49
     local dist_version=${os_CODENAME}
50 50
     local arch=$(dpkg --print-architecture)
51 51
     if is_ubuntu; then
52
-        if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
53
-            apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual
54
-        else
55
-            (>&2 echo "WARNING: Current kernel is not supported by the linux-image-extra-virtual package. Docker may not work.")
52
+        if [[ ${dist_version} == 'trusty' ]]; then
53
+            if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
54
+                apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual
55
+            else
56
+                (>&2 echo "WARNING: Current kernel is not supported by the linux-image-extra-virtual package. Docker may not work.")
57
+            fi
56 58
         fi
57 59
         apt_get install apt-transport-https ca-certificates software-properties-common
58 60
         curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -

Loading…
Cancel
Save