mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

inspect: return osinfo short IDs for rolling distros

Browse Source 
Return the right osinfo short IDs for some rolling Linux distributions,
such as Arch Linux, Gentoo, and Void Linux.  Their IDs were recently
added to osinfo-db.
This commit is contained in:
Pino Toscano
2019-02-19 08:56:52 +01:00
parent aee4a96ce2
commit 764ee8c74e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inspector/expected-archlinux.img.xml
View File

@@ -10,6 +10,7 @@
<package_format>pacman</package_format>
<package_management>pacman</package_management>
<hostname>archlinux.test</hostname>
<osinfo>archlinux</osinfo>
<mountpoints>
<mountpoint dev="/dev/sda1">/</mountpoint>
</mountpoints>

3
lib/inspect-osinfo.c
View File

@@ -59,6 +59,9 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root)
}
else if (STREQ (distro, "ubuntu"))
return safe_asprintf (g, "%s%d.%02d", distro, major, minor);
else if (STREQ (distro, "archlinux") || STREQ (distro, "gentoo")
|| STREQ (distro, "voidlinux"))
return safe_strdup (g, distro);
if (major > 0 || minor > 0)
return safe_asprintf (g, "%s%d.%d", distro, major, minor);