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

inspect: resolve symlinks when detecting architecture

Browse Source 
Resolve the paths of the binaries we are looking in the guest to
identify the architecture. This way we can identify also busybox-based
guests such as Alpine Linux, where all the "base" binaries in /bin are
symlinks to busybox.
This commit is contained in:
Pino Toscano
2016-01-26 18:49:55 +01:00
committed by Richard W.M. Jones
parent 302bba4f3f
commit 7adb8ffa61
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/inspect-fs-unix.c
View File

@@ -1079,13 +1079,25 @@ check_architecture (guestfs_h *g, struct inspect_fs *fs)
const char *binaries[] =
{ "/bin/bash", "/bin/ls", "/bin/echo", "/bin/rm", "/bin/sh" };
size_t i;
char *arch;
char *arch = NULL;
for (i = 0; i < sizeof binaries / sizeof binaries[0]; ++i) {
if (guestfs_is_file (g, binaries[i]) > 0) {
/* Ignore errors from file_architecture call. */
/* Allow symlinks when checking the binaries:,so in case they are
* relative ones (which can be resolved within the same partition),
* then we can check the architecture of their target.
*/
if (guestfs_is_file_opts (g, binaries[i],
GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) {
CLEANUP_FREE char *resolved = NULL;
/* Ignore errors from realpath and file_architecture calls. */
guestfs_push_error_handler (g, NULL, NULL);
arch = guestfs_file_architecture (g, binaries[i]);
resolved = guestfs_realpath (g, binaries[i]);
/* If is_file above succeeded realpath should too, but better
* be safe than sorry.
*/
if (resolved)
arch = guestfs_file_architecture (g, resolved);
guestfs_pop_error_handler (g);
if (arch) {