Explorar el Código

Merge pull request #20038 from doertedev/master

Grep for installed AND held packages.
David Calavera hace 9 años
padre
commit
f7f1730316
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      hack/install.sh

+ 1 - 1
hack/install.sh

@@ -372,7 +372,7 @@ do_install() {
 
 
 			# aufs is preferred over devicemapper; try to ensure the driver is available.
 			# aufs is preferred over devicemapper; try to ensure the driver is available.
 			if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
 			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' | grep -qE '^ii|^hi' 2>/dev/null; then
 					kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
 					kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
 
 
 					apt_get_update
 					apt_get_update