search for: package_manag

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/inspector/virt-inspector.pl b/in...

...rsion" => "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 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -489,1...

...urned 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 : fstab_entry list; + mutable windows_systemroot : stri...

...y) better. Problem reported by novegin on IRC. --- src/inspect-fs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 0714ae1..7f7d5d1 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -531,8 +531,11 @@ guestfs_int_check_package_management (guestfs_h *g, struct inspect_fs *fs) guestfs_is_file_opts (g, "/usr/bin/dnf", GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) fs->package_management = OS_PACKAGE_MANAGEMENT_DNF; - else + else if (fs->major_version >=...

...b/src/guestfs-internal.h index 0cd7f74..0c8857c 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -563,6 +563,7 @@ enum inspect_os_package_format { OS_PACKAGE_FORMAT_EBUILD, OS_PACKAGE_FORMAT_PISI, OS_PACKAGE_FORMAT_PKGSRC, + OS_PACKAGE_FORMAT_APK, }; enum inspect_os_package_management { @@ -576,6 +577,7 @@ enum inspect_os_package_management { OS_PACKAGE_MANAGEMENT_URPMI, OS_PACKAGE_MANAGEMENT_ZYPPER, OS_PACKAGE_MANAGEMENT_DNF, + OS_PACKAGE_MANAGEMENT_APK, }; struct inspect_fs { diff --git a/src/inspect-apps.c b/src/inspect-apps.c index 72c91ff..26091ab 100644...

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

...k_package_format (guestfs_h *g, struct inspect_fs *fs) case OS_DISTRO_FREEBSD: case OS_DISTRO_NETBSD: case OS_DISTRO_OPENBSD: + case OS_DISTRO_ALPINE_LINUX: case OS_DISTRO_UNKNOWN: fs->package_format = OS_PACKAGE_FORMAT_UNKNOWN; break; @@ -565,6 +566,7 @@ guestfs_int_check_package_management (guestfs_h *g, struct inspect_fs *fs) case OS_DISTRO_FREEBSD: case OS_DISTRO_NETBSD: case OS_DISTRO_OPENBSD: + case OS_DISTRO_ALPINE_LINUX: case OS_DISTRO_UNKNOWN: fs->package_management = OS_PACKAGE_MANAGEMENT_UNKNOWN; break; diff --git a/src/inspect-icon.c b/src/ins...

...cifically), it applies firewall/firewall_mail2.pp to mail2 as well as any other server configured as a puppetd client. --- BEGIN templates.pp --- # templates.pp node basenode { include virt_all_users, my_users, dns, sudoers, package_management, base_packages } node default inherits basenode {} --- END templates.pp --- --- BEGIN nodes.pp --- # nodes.pp node ''mail2.clientdomain.com'' inherits basenode { import "firewall/firewall_mail2" } --- END nodes.pp --- Am I doing something wr...

...nt_first_line_of_file (guestfs_h *g, const char *filename) extern int guestfs_int_first_egrep_of_file (guestfs_h *g, const char *filename, const char *eregex, int iflag, char **ret); extern void guestfs_int_check_package_format (guestfs_h *g, struct inspect_fs *fs); extern void guestfs_int_check_package_management (guestfs_h *g, struct inspect_fs *fs); +extern void guestfs_int_merge_fs_inspections (guestfs_h *g, struct inspect_fs *dst, struct inspect_fs *src); /* inspect-fs-unix.c */ extern int guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs); diff --git a/src/inspect-fs.c b/src/in...

...tingsystem> -</operatingsystems> diff --git a/inspector/example-debian.xml b/inspector/example-debian.xml index eb10d8567..22f391d80 100644 --- a/inspector/example-debian.xml +++ b/inspector/example-debian.xml @@ -11,7 +11,6 @@ <package_format>deb</package_format> <package_management>apt</package_management> <hostname>debian5x64.home.annexia.org</hostname> - <format>installed</format> <mountpoints> <mountpoint dev="/dev/debian5x64.home.annexia.org/root">/</mountpoint> <mountpoint dev...

...nt_first_line_of_file (guestfs_h *g, const char *filename) extern int guestfs_int_first_egrep_of_file (guestfs_h *g, const char *filename, const char *eregex, int iflag, char **ret); extern void guestfs_int_check_package_format (guestfs_h *g, struct inspect_fs *fs); extern void guestfs_int_check_package_management (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs_int_merge_fs_inspections (guestfs_h *g, struct inspect_fs *dst, struct inspect_fs *src); /* inspect-fs-unix.c */ extern int guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs); diff --git a/src/inspect-fs.c b/src/ins...

...ckage_format (guestfs_h *g, struct inspect_fs *fs) case OS_DISTRO_OPENBSD: case OS_DISTRO_FRUGALWARE: case OS_DISTRO_PLD_LINUX: + case OS_DISTRO_VOID_LINUX: case OS_DISTRO_UNKNOWN: fs->package_format = OS_PACKAGE_FORMAT_UNKNOWN; break; @@ -583,6 +584,7 @@ guestfs_int_check_package_management (guestfs_h *g, struct inspect_fs *fs) case OS_DISTRO_OPENBSD: case OS_DISTRO_FRUGALWARE: case OS_DISTRO_PLD_LINUX: + case OS_DISTRO_VOID_LINUX: case OS_DISTRO_UNKNOWN: fs->package_management = OS_PACKAGE_MANAGEMENT_UNKNOWN; break; diff --git a/src/inspect-icon.c b/src...

...</arch> <distro>sles</distro> <product_name>SUSE Linux Enterprise Server 12 (x86_64)</product_name> <major_version>12</major_version> <minor_version>0</minor_version> <package_format>rpm</package_format> <package_management>zypper</package_management> <hostname>linux-luwo.site</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev/sda3">/</mountpoint> <mountpoint dev="btrfsvol:/dev/sda3/@/opt">/...

...;windows". +=item arch + +Operating system userspace architecture, eg. "i386", "x86_64". + =item distro Operating system distribution, eg. "debian". @@ -1118,6 +1150,7 @@ sub _get_os_version if exists $r->{root}->{package_format}; $r->{package_management} = $r->{root}->{package_management} if exists $r->{root}->{package_management}; + $r->{arch} = $r->{root}->{arch} if exists $r->{root}->{arch}; } sub _assign_mount_points @@ -1267,6 +1300,24 @@ List of applications. List of kernels. +This is a ha...

On Wednesday 09 September 2015 15:54:10 Olaf Hering wrote: > Just poked around in my =libguestfs folder... > > On Wed, Sep 09, Pino Toscano wrote: > > > + if (STRPREFIX (line, "ID=")) { > > This is not handled: > > NAME="SLES" > VERSION="12" > VERSION_ID="12" > PRETTY_NAME="SUSE Linux Enterprise Server

...n" (string_of_os_type v)) - data.os_type; - may (fun v -> bpf " distro: %s\n" (string_of_distro v)) - data.distro; - may (fun v -> bpf " package_format: %s\n" (string_of_package_format v)) - data.package_format; - may (fun v -> bpf " package_management: %s\n" (string_of_package_management v)) - data.package_management; - may (fun v -> bpf " product_name: %s\n" v) - data.product_name; - may (fun v -> bpf " product_variant: %s\n" v) - data.product_variant; - may (fun (major, minor) -> b...

From: Michael Scherer <misc at zarb.org> Without this, configure will always enable erlang, no matter what argument are passed. Now, we can disable it, even if configure still need the erlang compiler for some obscure reason. --- configure.ac | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 337a3ed..e0bed2f 100644 ---

...| 94 ++++++++++++++++++++ 8 files changed, 214 insertions(+), 210 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 6b3cfdf..0b207b2 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -605,8 +605,7 @@ struct inspect_fs { enum inspect_os_package_management package_management; char *product_name; char *product_variant; - int major_version; - int minor_version; + struct version version; char *arch; char *hostname; char *windows_systemroot; @@ -933,7 +932,12 @@ extern void guestfs_int_waitpid_noerror (pid_t pid); /* version.c */...

Few improvements to the results of the inspection on some distros. Pino Toscano (5): inspect: factorize list of rolling distros inspect: detect Gentoo from os-release inspect: fully detect Arch Linux from os-release inspect: return osinfo short IDs for rolling distros inspect: correct osinfo ID for ALT Linux >= 8 daemon/inspect_fs_unix.ml | 15 +++++++++------

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I