search for: blkidtab

.../VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1132,6 +1132,11 @@ sub remap_block_devices $g->aug_set($spec, "/dev/".$map{$name}.$part); } $g->aug_save(); + + # Delete cached (and now out of date) blkid info if it exists + foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { + $g->rm($blkidtab) if ($g->exists($blkidtab)); + } } sub _drivecmp -- 1.6.6.1

...gin exception details. 02:24:19,800 INFO blivet: IGNORED: Traceback (most recent call last): 02:24:19,800 INFO blivet: IGNORED: File "/usr/lib/python2.7/site-packages/blivet/__init__.py", line 3227, in parseFSTab 02:24:19,800 INFO blivet: IGNORED: blkidTab.parse() 02:24:19,800 INFO blivet: IGNORED: File "/usr/lib/python2.7/site-packages/blivet/__init__.py", line 2282, in parse 02:24:19,800 INFO blivet: IGNORED: with open(path) as f: 02:24:19,800 INFO blivet: IGNORED: IOError: [Errno 2] No such file...

...map{$name}.$part); - } - $g->aug_save(); + $g->aug_set($spec, "/dev/".$map{$name}.$part); + } + $g->aug_save(); + }; + + $self->_augeas_error($@) if ($@); # Delete cached (and now out of date) blkid info if it exists foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { @@ -1292,21 +1364,11 @@ sub prepare_bootable } } - eval { - $g->aug_save(); - }; - - if ($@) { - my $msg = ''; - foreach my $error ($g->aug_match(...

...ed = '/dev/'.$map{$name}; + $mapped .= $part if defined($part); + $g->aug_set($spec, $mapped); + } + + $g->aug_save(); + }; + + augeas_error($g, $@) if ($@); + + # Delete cached (and now out of date) blkid info if it exists + foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { + $g->rm($blkidtab) if ($g->exists($blkidtab)); + } +} + +sub _prepare_bootable +{ + my ($g, $root, $grub, $version, @modules) = @_; + + my $path = "/boot/vmlinuz-$version"; + $grub->write($path); +...

...ed = '/dev/'.$map{$name}; + $mapped .= $part if defined($part); + $g->aug_set($spec, $mapped); + } + + $g->aug_save(); + }; + + augeas_error($g, $@) if ($@); + + # Delete cached (and now out of date) blkid info if it exists + foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { + $g->rm($blkidtab) if ($g->exists($blkidtab)); + } +} + +sub _prepare_bootable +{ + my ($g, $root, $grub, $version, @modules) = @_; + + my $path = "/boot/vmlinuz-$version"; + $grub->write($path); +...

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

This is a new conversion module to convert SUSE Linux and openSUSE guests. The converter is based on the RedHat module, and should offer the same functionality on both SUSE and RedHat hosts. There are a few additional messages in this module, such as reporting of packages when installing through zypper or the local virt-v2v repo. These messages don't necessarily flow unless verbose switches