search for: package_format

It turns out that the distribution hierarchy is not as reliable concept as you might think. This patch removes distrofamily again. Instead of distrofamily, we will add feature tags. This patch adds 2 feature tags for Linux distributions: package_format (eg rpm/dpkg) package_management (eg rhn/yum/apt) This change is reflected in the output of virt-inspector --- inspector/virt-inspector.pl | 4 ++-- perl/lib/Sys/Guestfs/Lib.pm | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/insp...

...100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -79,7 +79,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = | "sles" | "suse-based" | "opensuse" -> `SUSE_family | _ -> assert false in - assert (inspect.i_package_format = "rpm"); + assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb"); (* We use Augeas for inspection and conversion, so initialize it early. *) Linux.augeas_init g; diff --git a/v2v/linux.ml b/v2v/linux.ml index ed639c1..d449e10 100644 --...

....ml > +++ b/v2v/convert_linux.ml > @@ -79,7 +79,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > | "sles" | "suse-based" | "opensuse" -> `SUSE_family > | _ -> assert false in > > - assert (inspect.i_package_format = "rpm"); > + assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb"); > > (* We use Augeas for inspection and conversion, so initialize it early. *) > Linux.augeas_init g; > diff --git a/v2v/linux.ml b/v2v/linux.ml > in...

Hi, this series implements the first bits in v2v to convert Debian/Ubuntu (and derived) guests. The series does not complete the support (see known issues below), but all the patches here should be fit for review and inclusion. The series does not enable the conversion, yet. Known issues: * there is no grubby nor Bootloader::Tools Perl module available in Debian, so there is no way to know

...@@ -79,7 +79,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > > > | "sles" | "suse-based" | "opensuse" -> `SUSE_family > > > | _ -> assert false in > > > > > > - assert (inspect.i_package_format = "rpm"); > > > + assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb"); > > > > > > (* We use Augeas for inspection and conversion, so initialize it early. *) > > > Linux.augeas_init g; > > &gt...

...100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -79,7 +79,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = | "sles" | "suse-based" | "opensuse" -> `SUSE_family | _ -> assert false in - assert (inspect.i_package_format = "rpm"); + assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb"); (* We use Augeas for inspection and conversion, so initialize it early. *) Linux.augeas_init g; diff --git a/v2v/linux.ml b/v2v/linux.ml index ed639c1..5713f64 100644 --...

This fixes a problem where inspection would die if grub.conf referenced a non-existent initrd. Just return an empty initrd instead. --- perl/lib/Sys/Guestfs/Lib.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index 5428b10..b5b3906 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@

...[ "distro" => "distro" ], - [ "version" => "version" ], + [ "major_version" => "major_version" ], + [ "minor_version" => "minor_version" ], [ "package_format" => "package_format" ], [ "package_management" => "package_management" ], [ "root" => "root_device" ] ) { diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index a581def..5d48ba8 10064...

...t_linux.ml > > @@ -79,7 +79,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > > | "sles" | "suse-based" | "opensuse" -> `SUSE_family > > | _ -> assert false in > > > > - assert (inspect.i_package_format = "rpm"); > > + assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb"); > > > > (* We use Augeas for inspection and conversion, so initialize it early. *) > > Linux.augeas_init g; > > diff --git a/v2v/linux....

...table object.*) + vfs_type : string; (** Returned from [vfs_type] API. *) +} + +and role = + | RoleRoot of inspection_data + | RoleUsr of inspection_data + | RoleSwap + | RoleOther +and inspection_data = { + mutable os_type : os_type option; + mutable distro : distro option; + mutable package_format : package_format option; + mutable package_management : package_management option; + mutable product_name : string option; + mutable product_variant : string option; + mutable version : version option; + mutable arch : string option; + mutable hostname : string option; + mutable fstab : fsta...

..._check_for_kernels } $config{cmdline} = join(' ', @args) if(scalar(@args) > 0); - my $kernel = _inspect_linux_kernel($g, $os, "$path"); + my $kernel = + inspect_linux_kernel($g, $path, $os->{package_format}); # Check the kernel was recognised if(defined($kernel)) { + # Put this kernel on the top level kernel list + my $kernels = $os->{kernels}; + if(!defined($kernels)) { + $kernels =...

Hi, this series implements the first bits in v2v to convert Debian/Ubuntu (and derived) guests. The series does not complete the support (see known issues below), but all the patches here should be fit for review and inclusion. The series does not enable the conversion, yet. Known issues: * there is no grubby nor Bootloader::Tools Perl module available in Debian, so there is no way to know

...cal files without touching network. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- In this case, better name it local_install/install_local (or something along these lines) to make it more clear it is not a "classic install". > +and do_install g { i_package_format = package_format } packages = > + assert (List.length packages > 0); > + match package_format with > + | "rpm" -> > + let cmd = [ "yum"; "--assumeyes"; "install" ] @ packages in > + let cmd = Array.of_list cmd in > + ignore...

...et is_package_manager_save_file filename = (* Recognized suffixes of package managers. *) let suffixes = [ ".dpkg-old"; ".dpkg-new"; ".rpmsave"; ".rpmnew"; ] in List.exists (Filename.check_suffix filename) suffixes + +let binary_package_extension { i_package_format = package_format } = + match package_format with + | "deb" -> "deb" + | "rpm" -> "rpm" + | format -> + error (f_"don’t know what is the extension of binary packages using %s") + format + +let architecture_string { i_package_form...

.../Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1643,8 +1643,14 @@ sub _check_for_kernels } $config{cmdline} = join(' ', @args) if(scalar(@args) > 0); - my $kernel = - inspect_linux_kernel($g, $path, $os->{package_format}); + my $kernel; + if ($g->exists($path)) { + $kernel = + inspect_linux_kernel($g, $path, $os->{package_format}); + } else { + warn __x("grub refers to {path}, which doesn't exis...

Try to guess the possible osinfo-db short ID for the specified OS. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1544842 --- generator/actions_inspection.ml | 14 ++++++++ lib/Makefile.am | 1 + lib/inspect-osinfo.c | 75 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 lib/inspect-osinfo.c diff --git

This series slightly improves the way qemu-ga is installed from the RHV Tools ISO, simplifying the feedback to the user. Patch #3 sort of conflicts with patch #2 of a related series by Tomáš Golembiovský: https://www.redhat.com/archives/libguestfs/2019-February/msg00016.html Pino Toscano (3): v2v: linux: add helper functions for pkg arch and extension v2v: try to pick the right arch for

...ux.ml index bc4af1ad2..d759bf7e6 100644 --- a/v2v/linux.ml +++ b/v2v/linux.ml @@ -99,58 +99,26 @@ let file_list_of_package (g : Guestfs.guestfs) inspect app = error (f_"don’t know how to get list of files from package using %s") format -let rec file_owner (g : G.guestfs) { i_package_format = package_format } path = +let is_file_owned (g : G.guestfs) { i_package_format = package_format } path = match package_format with - | "deb" -> - (* With dpkg usually the directories are owned by all the packages - * that install anything in them. Also with multiarch t...

...#aug_load (); > debug_augeas_errors g > > +let rec install g inspect packages = > + if packages <> [] then ( > + do_install g inspect packages; > + (* Reload Augeas in case anything changed. *) > + augeas_reload g > + ) > + > +and do_install g { i_package_format = package_format } packages = It's purely a matter of style, but it's also possible to nest functions, so: let install g inspect packages = let do_install () = ... in if packages <> [] then ( do_install (); ... Of course you could also inline do_inst...

...it a/src/guestfs-internal.h b/src/guestfs-internal.h index bbd7fb4..0cd7f74 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -552,6 +552,7 @@ enum inspect_os_distro { OS_DISTRO_FREEBSD, OS_DISTRO_NETBSD, OS_DISTRO_COREOS, + OS_DISTRO_ALPINE_LINUX, }; enum inspect_os_package_format { diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index c9bbad9..abfa527 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -601,6 +601,16 @@ guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs) if (guestfs_int_parse_major_minor (g, fs) == -1) ret...