[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] v2v: tell v2v the real root device to mkinitrd



From: Pino Toscano <ptoscano redhat com>

Complementary fix of commit 2d25872df3619a3077006ad0f91c029602db6780.
On SLES 11 SP4 with kdump enabled mkinitrd calls mkdumprd which calls
mkinitrd, but mkdumprd doesn't have any clue of the root device.

Call mkinitrd with rootdev environment variable to tell them all
what device to use as root.

Tested-By: Cédric Bosdonnat <cbosdonnat suse com>
---
 v2v/convert_linux.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index f8dfa00d7..42a19947b 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -514,7 +514,9 @@ let rec convert (g : G.guestfs) inspect source output rcaps =
       else if family = `SUSE_family
            && g#is_file ~followsymlinks:true "/sbin/mkinitrd" then (
         ignore (
-          g#command [| "/sbin/mkinitrd";
+          g#command [| "/usr/bin/env";
+                       "rootdev=" ^ inspect.i_root;
+                       "/sbin/mkinitrd";
                        "-m"; String.concat " " modules;
                        "-i"; initrd;
                        "-k"; kernel.ki_vmlinuz;
-- 
2.12.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]