]> xenbits.xensource.com Git - libvirt.git/commitdiff
virkmodtest: Don't fail if modprobe doesn't exist
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 14 Feb 2019 15:25:44 +0000 (16:25 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 14 Feb 2019 17:03:10 +0000 (18:03 +0100)
On some very basic installations (e.g. some container images) the
modprobe binary might be missing. If that is the case, don't fail
virkmodtest.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
tests/virkmodtest.c

index c90830a23cc4f27f071ac1c7f371a8c02817e234..80029244ffeb7b6a675bb05b723ce84334f6517a 100644 (file)
@@ -46,7 +46,12 @@ testKModConfig(const void *args ATTRIBUTE_UNUSED)
      */
     outbuf = virKModConfig();
     if (!outbuf) {
-        fprintf(stderr, "Failed to get config\n");
+        if (virFileIsExecutable(MODPROBE)) {
+            fprintf(stderr, "Failed to get config\n");
+        } else {
+            /* modprobe doesn't exist, do not claim error. */
+            ret = 0;
+        }
         goto cleanup;
     }
     ret = 0;