search for: aug_get

...or"); + my $file = $1; + + my %detail; + foreach my $detail_path ($g->aug_match("$error//*")) { + $detail_path =~ /^$error\/(.*)$/ + or die("Unexpected return from aug_match: $detail_path"); + $detail{$1} = $g->aug_get($detail_path); + } + + if (defined($detail{message})) { + $msg .= __x("augeas error for {file}: {error}", + file => $file, + error => $detail{message})."\n"; + } else { + $msg .= __x(&qu...

...: list_md_devices libguestfs: trace: list_md_devices = [] libguestfs: trace: aug_match "/files/etc/fstab/*[label() != '#comment']" libguestfs: trace: aug_match = ["/files/etc/fstab/1", "/files/etc/fstab/2", "/files/etc/fstab/3"] libguestfs: trace: aug_get "/files/etc/fstab/1/spec" libguestfs: trace: aug_get = "UUID=a1d1d2db-71f3-4354-95ba-fc582e84c26e" libguestfs: trace: aug_get "/files/etc/fstab/1/file" libguestfs: trace: aug_get = "/" libguestfs: trace: findfs_uuid "a1d1d2db-71f3-4354-95ba-fc582e84c...

..."] > libguestfs: trace: v2v: aug_match > "/files/etc/default/grub/GRUB_CMDLINE_LINUX_DEFAULT" > guestfsd: main_loop: new request, len 0x60 > guestfsd: main_loop: proc 24 (aug_match) took 0.00 seconds > libguestfs: trace: v2v: aug_match = [] > libguestfs: trace: v2v: aug_get "/files/etc/default/grub/GRUB_CMDLINE_LINUX" > guestfsd: main_loop: new request, len 0x58 > guestfsd: main_loop: proc 19 (aug_get) took 0.00 seconds > libguestfs: trace: v2v: aug_get = ""rhgb quiet"" > libguestfs: trace: v2v: is_file "/etc/X11/xorg.con...

...ne 1022 libguestfs: trace: available "augeas" libguestfs: trace: available = 0 libguestfs: trace: aug_init "/" 16 libguestfs: trace: aug_init = 0 libguestfs: trace: aug_match "/files//etc/grub.conf/title" libguestfs: trace: aug_match = [""] libguestfs: trace: aug_get "/files//etc/grub.conf/default" libguestfs: trace: aug_get = NULL (error) libguestfs: trace: aug_init "/" 16 libguestfs: trace: aug_init = 0 libguestfs: trace: aug_match "/files/etc/conf.modules/alias" libguestfs: trace: aug_match = [""] libguestfs: trace: au...

...t; libguestfs: trace: list_md_devices = [] > libguestfs: trace: aug_match "/files/etc/fstab/*[label() != '#comment']" > libguestfs: trace: aug_match = ["/files/etc/fstab/1", "/files/etc/fstab/2", "/files/etc/fstab/3"] > libguestfs: trace: aug_get "/files/etc/fstab/1/spec" > libguestfs: trace: aug_get = "UUID=a1d1d2db-71f3-4354-95ba-fc582e84c26e" > libguestfs: trace: aug_get "/files/etc/fstab/1/file" > libguestfs: trace: aug_get = "/" > libguestfs: trace: findfs_uuid "a1d1d2db-71f3...

...sc}->{boot}->{grub_fs} eq "/boot") { + $prefix = ''; + } else { + $prefix = '/boot'; + } + foreach my $kernel ($g->aug_match('/files/boot/grub/menu.lst/title/kernel')) { - if($g->aug_get($kernel) eq "/vmlinuz-$version") { + if($g->aug_get($kernel) eq "$prefix/vmlinuz-$version") { # Ensure it's the default $kernel =~ m{/files/boot/grub/menu.lst/title(?:\[(\d+)\])?/kernel} or die($kernel); @@...

...= Array.to_list paths in + + (* Remove duplicates. *) + let paths = remove_duplicates paths in + + (* Get the default kernel from grub if it's set. *) + let default = + let expr = sprintf "/files%s/default" grub_config in + try + let idx = g#aug_get expr in + let idx = int_of_string idx in + (* Grub indices are zero-based, augeas is 1-based. *) + let expr = + sprintf "/files%s/title[%d]/kernel" grub_config (idx+1) in + Some expr + with G.Error msg + when String.find ms...

...= Array.to_list paths in + + (* Remove duplicates. *) + let paths = remove_duplicates paths in + + (* Get the default kernel from grub if it's set. *) + let default = + let expr = sprintf "/files%s/default" grub_config in + try + let idx = g#aug_get expr in + let idx = int_of_string idx in + (* Grub indices are zero-based, augeas is 1-based. *) + let expr = + sprintf "/files%s/title[%d]/kernel" grub_config (idx+1) in + Some expr + with G.Error msg + when String.find msg &...

...(* Remove duplicates. *) > + let paths = remove_duplicates paths in > + > + (* Get the default kernel from grub if it's set. *) > + let default = > + let expr = sprintf "/files%s/default" grub_config in > + try > + let idx = g#aug_get expr in > + let idx = int_of_string idx in > + (* Grub indices are zero-based, augeas is 1-based. *) > + let expr = > + sprintf "/files%s/title[%d]/kernel" grub_config (idx+1) in > + Some expr > + with G.Error msg &gt...

...estfs: trace: list_md_devices = [] >> libguestfs: trace: aug_match "/files/etc/fstab/*[label() != '#comment']" >> libguestfs: trace: aug_match = ["/files/etc/fstab/1", "/files/etc/fstab/2", "/files/etc/fstab/3"] >> libguestfs: trace: aug_get "/files/etc/fstab/1/spec" >> libguestfs: trace: aug_get = "UUID=a1d1d2db-71f3-4354-95ba-fc582e84c26e" >> libguestfs: trace: aug_get "/files/etc/fstab/1/file" >> libguestfs: trace: aug_get = "/" >> libguestfs: trace: findfs_uuid "a...

...- (* Remove duplicates. *) - let paths = remove_duplicates paths in - - (* Get the default kernel from grub if it's set. *) - let default = - let expr = sprintf "/files%s/default" grub_config in - try - let idx = g#aug_get expr in - let idx = int_of_string idx in - (* Grub indices are zero-based, augeas is 1-based. *) - let expr = - sprintf "/files%s/title[%d]/kernel" grub_config (idx+1) in - Some expr - with G.Error msg -...

...22 insertions(+), 24 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 77d9332..10ff77d 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -350,39 +350,37 @@ sub get_default_kernel $default = $g->aug_get('/files/boot/grub/menu.lst/default'); }; + # Get the grub filesystem + my $grub = $self->{desc}->{boot}->{grub_fs}; + + # Look for a kernel, starting with the default + my @paths; + push(@paths, $g->aug_match("/files/boot/grub/menu.lst/". +...

...fs eq '/boot' ? '' : '/boot'; + # Nothing to do if there's already a grub entry - eval { + return if eval { foreach my $augpath ($g->aug_match('/files/boot/grub/menu.lst/title/kernel')) { - return if ($g->aug_get($augpath) eq $kernel); + return 1 if ($grubfs.$g->aug_get($augpath) eq $kernel); } + + return 0 }; augeas_error($g, $@) if ($@); - my $prefix; - if ($desc->{boot}->{grub_fs} eq "/boot") { - $prefix = ''; - } else { -...

This change is part of an ongoing effort to remove use of $desc and inspect the OS directly as required during conversion. --- lib/Sys/VirtConvert/Connection/LibVirtTarget.pm | 4 +- lib/Sys/VirtConvert/Connection/RHEVTarget.pm | 41 +++++++++--------- lib/Sys/VirtConvert/Converter.pm | 35 ++++++++++++---- lib/Sys/VirtConvert/Converter/RedHat.pm | 45

...g root side_effects = String.sub userpath (i+1) (String.length userpath -i-1) in if uid >= uid_min && uid <= uid_max && check_remove_user username then ( + (* Get the home before removing the passwd entry. *) + let home_dir = g#aug_get (userpath ^ "/home") in g#aug_rm userpath; (* XXX Augeas doesn't yet have a lens for /etc/shadow, so the * next line currently does nothing, but should start to @@ -91,7 +93,7 @@ let user_account_perform ~verbose ~quiet g root side_effects =...

...fs: trace: aug_match "/files/etc/fstab/*[label() != '#comment']" guestfsd: main_loop: new request, len 0x58 guestfsd: main_loop: proc 24 (aug_match) took 0.00 seconds libguestfs: trace: aug_match = ["/files/etc/fstab/1", "/files/etc/fstab/2"] libguestfs: trace: aug_get "/files/etc/fstab/1/spec" guestfsd: main_loop: new request, len 0x44 guestfsd: main_loop: proc 19 (aug_get) took 0.00 seconds libguestfs: trace: aug_get = "LABEL=cloudimg-rootfs" libguestfs: trace: aug_get "/files/etc/fstab/1/file" guestfsd: main_loop: new request, len...

Add a directory to contain required augeas lenses which aren't yet upstream. Include a new lens for grub's device.map. --- augeas/README.txt | 4 ++++ augeas/device_map.aug | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 augeas/README.txt create mode 100644 augeas/device_map.aug diff --git a/augeas/README.txt

...7d440c29 100644 --- a/customize/SELinux_relabel.ml +++ b/customize/SELinux_relabel.ml @@ -37,8 +37,18 @@ let relabel (g : G.guestfs) = g#aug_load (); debug_augeas_errors g; - (* Get the SELinux policy name, eg. "targeted", "minimum". *) - let policy = g#aug_get "/files/etc/selinux/config/SELINUXTYPE" in + (* Get the SELinux policy name, eg. "targeted", "minimum". + * Use "targeted" if not specified, just like libselinux does. + *) + let policy = + let config_path = "/files/etc/selin...

This is a repost of the patch I sent on Friday. I know it was already ACK'd, but I've changed a fair bit in addition to adding the requested POD. Specifically: I discovered that augeas's grub lens wasn't returning cmdline the way I expected. This is fixed. The kernel package, if known, is output as a property of the kernel. The XML output of virt-inspector is updated with all

...s + $g->aug_init("/", 16); + + my @configs = (); + # Get all configurations from grub + foreach my $bootable + ($g->aug_match("/files/etc/grub.conf/title")) + { + my %config = (); + $config{title} = $g->aug_get($bootable); + + my $grub_kernel; + eval { + $grub_kernel = $g->aug_get("$bootable/kernel"); + }; + if($@) { + warn __x("Grub entry {title} has no kernel", + title => $config{t...