inspect: fix detection of newer CirrOS versions (RHBZ#1045450).

Add an own case for CirrOS, based on the /etc/cirros/version file
provided in newer version instead of the Buildroot-generated
/etc/br-version.
This commit is contained in:
Pino Toscano
2013-12-20 15:00:09 +01:00
parent 1580d965cd
commit d20289186d

View File

@@ -574,6 +574,18 @@ guestfs___check_linux_root (guestfs_h *g, struct inspect_fs *fs)
return -1;
}
/* CirrOS versions providing a own version file.
*/
else if (guestfs_is_file_opts (g, "/etc/cirros/version",
GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) {
fs->distro = OS_DISTRO_CIRROS;
if (parse_release_file (g, fs, "/etc/cirros/version") == -1)
return -1;
if (guestfs___parse_major_minor (g, fs) == -1)
return -1;
}
/* Buildroot (http://buildroot.net) is an embedded Linux distro
* toolkit. It is used by specific distros such as Cirros.
*/