[Libguestfs] [PATCH 2/2] v2v: linux: Use /etc/modprobe.conf.local if it exists.

[Richard W.M. Jones]

On SUSE (only) there is /etc/modprobe.conf which is generated from a
/usr/share file.  Local changes are meant to be added to
/etc/modprobe.conf.local.
---
 v2v/convert_linux.ml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 3fd58ce..08f4b2a 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -679,9 +679,10 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps =
       (* Execute g#aug_match, but against every known location of
          modules.conf. *)
       let paths = [
-        "/files/etc/conf.modules/alias";
+        "/files/etc/conf.modules/alias";        (* modules_conf.aug *)
         "/files/etc/modules.conf/alias";
-        "/files/etc/modprobe.conf/alias";
+        "/files/etc/modprobe.conf/alias";       (* modprobe.aug *)
+        "/files/etc/modprobe.conf.local/alias";
         "/files/etc/modprobe.d/*/alias";
       ] in
       let paths =
@@ -700,6 +701,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps =
       ) else (
         (* List of methods, in order of preference. *)
         let paths = [
+          "/etc/modprobe.conf.local";
           "/etc/modprobe.conf";
           "/etc/modules.conf";
           "/etc/conf.modules"
-- 
2.9.3