From docker/docker - Grep for installed AND held packages.

Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
This commit is contained in:
Stefan Staudenmeyer authored and Eli Uriegas committed 2017-06-16 11:53:39 -07:00
1 parent 2e5137bfab
commit 760cd763eb
1 file changed
+1 -1
+1 -1
View File
@@ -372,7 +372,7 @@ do_install() {
# aufs is preferred over devicemapper; try to ensure the driver is available.
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -q '^ii' 2>/dev/null; then
if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | egrep '^ii|^hi' 2>/dev/null; then
kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
apt_get_update