mrc0mmand / rpms / libguestfs

Forked from rpms/libguestfs 3 years ago
Clone

Blame SOURCES/0055-v2v-linux-Remap-device-names-in-boot-grub2-device.ma.patch

0d20ef
From ff5f1cbfc2b9bc92454695313e2f28c832e2c880 Mon Sep 17 00:00:00 2001
0d20ef
From: "Richard W.M. Jones" <rjones@redhat.com>
0d20ef
Date: Thu, 20 Nov 2014 10:08:51 +0000
0d20ef
Subject: [PATCH] v2v: linux: Remap device names in /boot/grub2/device.map
0d20ef
 (RHBZ#1165975).
0d20ef
0d20ef
Thanks: Junquin Zhou
0d20ef
(cherry picked from commit 7b8c6e762e10033b174f8554145d48489718b8b5)
0d20ef
---
0d20ef
 v2v/convert_linux.ml | 1 +
0d20ef
 1 file changed, 1 insertion(+)
0d20ef
0d20ef
diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
0d20ef
index 6c483c2..e85a0d5 100644
0d20ef
--- a/v2v/convert_linux.ml
0d20ef
+++ b/v2v/convert_linux.ml
0d20ef
@@ -1287,6 +1287,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
0d20ef
       "/files/etc/sysconfig/grub/GRUB_CMDLINE_LINUX";
0d20ef
       "/files/etc/default/grub/GRUB_CMDLINE_LINUX";
0d20ef
       "/files/etc/default/grub/GRUB_CMDLINE_LINUX_DEFAULT";
0d20ef
+      "/files/boot/grub2/device.map/*[label() != \"#comment\"]";
0d20ef
     ] in
0d20ef
 
0d20ef
     (* Which of these paths actually exist? *)
0d20ef
-- 
0d20ef
1.8.3.1
0d20ef