[Libguestfs] [PATCH 2/4] Remove BoardName and VendorName when updating xorg.conf

[Matthew Booth]

BoardName and VendorName are for information only, and will likely contain
incorrect information after conversion. Simply remove them.

Fixes RHBZ#595264
---
 lib/Sys/VirtV2V/GuestOS/RedHat.pm |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm
index 74b9de1..a475db8 100644
--- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm
+++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm
@@ -299,6 +299,14 @@ sub update_display_driver
             $g->aug_set($path, $driver);
         }
 
+        # Remove VendorName and BoardName if present
+        foreach my $path
+            ($g->aug_match('/files'.$self->{xorg}.'/Device/VendorName'),
+             $g->aug_match('/files'.$self->{xorg}.'/Device/BoardName'))
+        {
+            $g->aug_rm($path);
+        }
+
         $g->aug_save();
     };
 
-- 
1.7.2.3