search for: inspect_get_package_management

...tomize/customize_run.ml index ed3c818..48475af 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -97,6 +97,11 @@ exec >>%s 2>&1 let guest_install_command packages = let quoted_args = String.concat " " (List.map quote packages) in match g#inspect_get_package_management root with + | "apk" -> + sprintf " + apk update + apk add %s + " quoted_args | "apt" -> (* http://unix.stackexchange.com/questions/22820 *) sprintf " @@ -124,6 +129,11 @@ exec >>%s 2>&1 and...

...gt;&1 > in > > (* http://distrowatch.com/dwres.php?resource=package-management *) > - let guest_install_command packages = > + let rec guest_install_command packages = > let quoted_args = String.concat " " (List.map quote packages) in > match g#inspect_get_package_management root with > | "apk" -> > @@ -116,10 +116,11 @@ exec >>%s 2>&1 > | "urpmi" -> sprintf "urpmi %s" quoted_args > | "yum" -> sprintf "yum -y install %s" quoted_args > | "zypper" -&gt...

In cases where parsing the release file failed and so we have an obviously incorrect major version number, don't try to infer the package manager from the major version number. In the bug report, parsing the /etc/redhat-release file of a CentOS 7.1 guest failed, so major version was set to 0, and the package manager was inferred as "up2date". virt-customize then failed with a

...@ -94,7 +94,7 @@ exec >>%s 2>&1 in (* http://distrowatch.com/dwres.php?resource=package-management *) - let guest_install_command packages = + let rec guest_install_command packages = let quoted_args = String.concat " " (List.map quote packages) in match g#inspect_get_package_management root with | "apk" -> @@ -116,10 +116,11 @@ exec >>%s 2>&1 | "urpmi" -> sprintf "urpmi %s" quoted_args | "yum" -> sprintf "yum -y install %s" quoted_args | "zypper" -> sprintf "zypper -n...

...of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation + +module G = Guestfs + +let package_manager_cache_perform g root = + let packager = g#inspect_get_package_management root in + match packager with + | "yum" -> + let cache = g#glob_expand "/var/cache/yum/*" in + Array.iter ( + fun dir -> + g#rm_rf dir + ) cache; [] + | "apt" -> + let cache = g#glob_expand "/var/cache/apt/arch...

...em as an argument, which may not be a block device. inspect_get_arch inspect_get_distro inspect_get_drive_mappings inspect_get_filesystems inspect_get_format inspect_get_hostname inspect_get_icon inspect_get_major_version inspect_get_minor_version inspect_get_mountpoints inspect_get_package_format inspect_get_package_management inspect_get_product_name inspect_get_product_variant inspect_get_type inspect_get_windows_current_control_set inspect_get_windows_systemroot inspect_is_live inspect_is_multipart inspect_is_netinst inspect_list_applications inspect_list_applications2 The following return filesystem descriptors. in...

...customize/customize_run.ml @@ -151,6 +151,31 @@ exec >>%s 2>&1 | pm -> error_unimplemented_package_manager (s_"--update") pm + and guest_uninstall_command packages = + let quoted_args = String.concat " " (List.map quote packages) in + match g#inspect_get_package_management root with + | "apk" -> sprintf "apk del %s" quoted_args + | "apt" -> + (* http://unix.stackexchange.com/questions/22820 *) + sprintf " + export DEBIAN_FRONTEND=noninteractive + apt_opts='-q -y -o Dpkg::Options::=--force-conf...

...p_operation_yum_uuid.ml index 396cac5..f7940de 100644 --- a/sysprep/sysprep_operation_yum_uuid.ml +++ b/sysprep/sysprep_operation_yum_uuid.ml @@ -20,10 +20,14 @@ open Sysprep_operation module G = Guestfs -let yum_uuid_perform g root = +let yum_uuid_perform g root show_log = let packager = g#inspect_get_package_management root in if packager = "yum" then ( - (try g#rm "/var/lib/yum/uuid" with G.Error _ -> ()); + (try + let file = "/var/lib/yum/uuid" in + g#rm file + logging show_log "Deleted %s\n" file + with G.Error _ -> ()); [] )...

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

...sysprep/sysprep_operation_package_manager_cache.ml > @@ -22,7 +22,7 @@ open Common_utils > > module G = Guestfs > > -let package_manager_cache_perform g root side_effects = > +let package_manager_cache_perform (g : Guestfs.guestfs) root side_effects = > let packager = g#inspect_get_package_management root in > let cache_dirs = > match packager with > diff --git a/sysprep/sysprep_operation_pam_data.ml b/sysprep/sysprep_operation_pam_data.ml > index c3b988f..698a052 100644 > --- a/sysprep/sysprep_operation_pam_data.ml > +++ b/sysprep/sysprep_operation_pam_data.ml > @@...

...ion_package_manager_cache.ml +++ b/sysprep/sysprep_operation_package_manager_cache.ml @@ -22,7 +22,7 @@ open Common_utils module G = Guestfs -let package_manager_cache_perform g root side_effects = +let package_manager_cache_perform (g : Guestfs.guestfs) root side_effects = let packager = g#inspect_get_package_management root in let cache_dirs = match packager with diff --git a/sysprep/sysprep_operation_pam_data.ml b/sysprep/sysprep_operation_pam_data.ml index c3b988f..698a052 100644 --- a/sysprep/sysprep_operation_pam_data.ml +++ b/sysprep/sysprep_operation_pam_data.ml @@ -21,7 +21,7 @@ open Common_gettext...

--- sysprep/sysprep_operation.mli | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation.mli b/sysprep/sysprep_operation.mli index 61dde72..eb89db4 100644 --- a/sysprep/sysprep_operation.mli +++ b/sysprep/sysprep_operation.mli @@ -16,14 +16,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -(** Structure used to describe sysprep

...: new request, len 0x48 guestfsd: main_loop: proc 19 (aug_get) took 0.00 seconds libguestfs: trace: aug_get = "ip6-allhosts" libguestfs: trace: aug_save guestfsd: main_loop: new request, len 0x28 libguestfs: trace: aug_save = 0 [ 312.3] Uninstalling packages: cloud-init libguestfs: trace: inspect_get_package_management "/dev/sda1" libguestfs: trace: inspect_get_package_management = "apt" libguestfs: trace: sh "exec >>'/tmp/builder.log' 2>&1\n\n\n\n export DEBIAN_FRONTEND=noninteractive\n apt_opts='-q -y -o Dpkg::Options::=--force-confnew'\n...

...Mountable.t) list -val inspect_get_filesystems : Mountable.t -> Mountable.t list -val inspect_get_format : Mountable.t -> string -val inspect_get_type : Mountable.t -> string -val inspect_get_distro : Mountable.t -> string -val inspect_get_package_format : Mountable.t -> string -val inspect_get_package_management : Mountable.t -> string -val inspect_get_product_name : Mountable.t -> string -val inspect_get_product_variant : Mountable.t -> string -val inspect_get_major_version : Mountable.t -> int -val inspect_get_minor_version : Mountable.t -> int -val inspect_get_arch : Mountable.t -> str...

...Mountable.t) list -val inspect_get_filesystems : Mountable.t -> Mountable.t list -val inspect_get_format : Mountable.t -> string -val inspect_get_type : Mountable.t -> string -val inspect_get_distro : Mountable.t -> string -val inspect_get_package_format : Mountable.t -> string -val inspect_get_package_management : Mountable.t -> string -val inspect_get_product_name : Mountable.t -> string -val inspect_get_product_variant : Mountable.t -> string -val inspect_get_major_version : Mountable.t -> int -val inspect_get_minor_version : Mountable.t -> int -val inspect_get_arch : Mountable.t -> str...

...stro with + | Some v -> string_of_distro v + | None -> "unknown" + +and inspect_get_package_format root = + let root = search_for_root root in + match root.inspection_data.package_format with + | Some v -> string_of_package_format v + | None -> "unknown" + +and inspect_get_package_management root = + let root = search_for_root root in + match root.inspection_data.package_management with + | Some v -> string_of_package_management v + | None -> "unknown" + +and inspect_get_product_name root = + let root = search_for_root root in + match root.inspection_data.product_...

...stro with + | Some v -> string_of_distro v + | None -> "unknown" + +and inspect_get_package_format root = + let root = search_for_root root in + match root.inspection_data.package_format with + | Some v -> string_of_package_format v + | None -> "unknown" + +and inspect_get_package_management root = + let root = search_for_root root in + match root.inspection_data.package_management with + | Some v -> string_of_package_management v + | None -> "unknown" + +and inspect_get_product_name root = + let root = search_for_root root in + match root.inspection_data.product_...

Hi, as a followup for the signature fix for mount_vfs [1], here it is a patch series to generate automatically most of the OCaml interfaces of daemon actions. Only the Lvm and Mount modules are left with hand-written interfaces. [1] https://www.redhat.com/archives/libguestfs/2018-April/msg00059.html Thanks, Pino Toscano (3): daemon: directly use Optgroups daemon: use the structs from the

I'm currently working on gobject bindings for libguestfs. I haven't got as far as compiling anything yet, but I've attached the C header for initial review. Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490 -------------- next part -------------- An embedded and

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing