search for: is_dir_bin

...images. --- src/inspect-fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 02fdb2a..ad175f8 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -217,7 +217,8 @@ check_filesystem (guestfs_h *g, const char *mountable, (is_dir_bin || (guestfs_is_symlink (g, "/bin") > 0 && guestfs_is_dir (g, "/usr/bin") > 0)) && - guestfs_is_file (g, "/etc/fstab") > 0) { + (guestfs_is_file (g, "/etc/fstab") > 0 || + gu...

...g, const char *file, const char *wanted_target); /* Find out if 'device' contains a filesystem. If it does, add * another entry in g->fses. @@ -215,8 +216,7 @@ check_filesystem (guestfs_h *g, const char *mountable, /* Linux root? */ else if (is_dir_etc && (is_dir_bin || - (guestfs_is_symlink (g, "/bin") > 0 && - guestfs_is_dir (g, "/usr/bin") > 0)) && + is_symlink_to (g, "/bin", "usr/bin") > 0) && guestfs_is_file (g, "/etc/fstab") &gt...

...ct-fs.c index 21d2a23..539d814 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -247,6 +247,17 @@ check_filesystem (guestfs_h *g, const char *mountable, if (guestfs___check_hurd_root (g, fs) == -1) return -1; } + /* Minix root? */ + else if (is_dir_etc && + is_dir_bin && + guestfs_is_file (g, "/service/vm") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/version") > 0) { + fs->is_root = 1; + fs->format = OS_FORMAT_INSTALLED; +...

...SD root. */ int guestfs_int_check_freebsd_root (guestfs_h *g, struct inspect_fs *fs) diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 1951678..9f7630b 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -245,8 +245,10 @@ check_filesystem (guestfs_h *g, const char *mountable, is_dir_bin && is_dir_share && guestfs_is_dir (g, "/local") > 0 && - guestfs_is_file (g, "/etc/fstab") == 0) - ; + guestfs_is_file (g, "/etc/fstab") == 0) { + if (guestfs_int_check_linux_usr (g, fs) == -1...

...fs.c index fe82132..aaddb49 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -177,6 +177,7 @@ check_filesystem (guestfs_h *g, const char *mountable, if (guestfs___check_freebsd_root (g, fs) == -1) return -1; } + /* NetBSD root? */ else if (is_dir_etc && is_dir_bin && guestfs_is_file (g, "/netbsd") > 0 && @@ -187,6 +188,17 @@ check_filesystem (guestfs_h *g, const char *mountable, if (guestfs___check_netbsd_root (g, fs) == -1) return -1; } + /* OpenBSD root? */ + else if (is_dir_etc && +...

...fs.c index fe82132..aaddb49 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -177,6 +177,7 @@ check_filesystem (guestfs_h *g, const char *mountable, if (guestfs___check_freebsd_root (g, fs) == -1) return -1; } + /* NetBSD root? */ else if (is_dir_etc && is_dir_bin && guestfs_is_file (g, "/netbsd") > 0 && @@ -187,6 +188,17 @@ check_filesystem (guestfs_h *g, const char *mountable, if (guestfs___check_netbsd_root (g, fs) == -1) return -1; } + /* OpenBSD root? */ + else if (is_dir_etc && +...

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. Changes in v2: - removed patches #1 and #2, already pushed - drop patch #3, no more needed - replace patch #4 with a better suggestion from Rich - change if into assert in patch #5 Thanks, Pino Toscano

...mp; + guestfs_is_file (g, "/etc/coreos/update.conf") > 0) { + fs->is_root = 1; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_coreos_root (g, fs) == -1) + return -1; + } /* Linux /usr/local? */ else if (is_dir_etc && is_dir_bin && @@ -246,6 +257,14 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_dir (g, "/local") > 0 && guestfs_is_file (g, "/etc/fstab") == 0) ; + /* CoreOS /usr? */ + else if (is_dir_bin && + is_dir...

...mp; + guestfs_is_file (g, "/etc/coreos/update.conf") > 0) { + fs->is_root = 1; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_coreos_root (g, fs) == -1) + return -1; + } /* Linux /usr/local? */ else if (is_dir_etc && is_dir_bin && @@ -246,6 +257,14 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_dir (g, "/local") > 0 && guestfs_is_file (g, "/etc/fstab") == 0) ; + /* CoreOS /usr? */ + else if (is_dir_bin && + is_dir...

...t; 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/inspect-fs.c b/src/inspect-fs.c > index 02fdb2a..ad175f8 100644 > --- a/src/inspect-fs.c > +++ b/src/inspect-fs.c > @@ -217,7 +217,8 @@ check_filesystem (guestfs_h *g, const char *mountable, > (is_dir_bin || > (guestfs_is_symlink (g, "/bin") > 0 && > guestfs_is_dir (g, "/usr/bin") > 0)) && > - guestfs_is_file (g, "/etc/fstab") > 0) { > + (guestfs_is_file (g, "/etc/fstab") >...

...nted_target); > > /* Find out if 'device' contains a filesystem. If it does, add > * another entry in g->fses. > @@ -215,8 +216,7 @@ check_filesystem (guestfs_h *g, const char *mountable, > /* Linux root? */ > else if (is_dir_etc && > (is_dir_bin || > - (guestfs_is_symlink (g, "/bin") > 0 && > - guestfs_is_dir (g, "/usr/bin") > 0)) && > + is_symlink_to (g, "/bin", "usr/bin") > 0) && > guestfs_is_file (g, "/...

...++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 7f7d5d1..e9976cf 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -217,7 +217,8 @@ check_filesystem (guestfs_h *g, const char *mountable, else if (is_dir_etc && (is_dir_bin || is_symlink_to (g, "/bin", "usr/bin") > 0) && - guestfs_is_file (g, "/etc/fstab") > 0) { + (guestfs_is_file (g, "/etc/fstab") > 0 || + guestfs_is_file (g, "/etc/hosts") > 0)) { f...

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. The series includes also a new private debug API, and its usage to fix the resolution of /dev/mapper/.. devices found in fstab; without it, LVM /usr filesystems are not recognized as belonging to their

...->is_root = 0; + bsd_primary->format = OS_FORMAT_UNKNOWN; + return; + } + } +} + /* Find out if 'device' contains a filesystem. If it does, add * another entry in g->fses. */ @@ -207,14 +240,6 @@ check_filesystem (guestfs_h *g, const char *mountable, is_dir_bin && guestfs_is_file (g, "/etc/freebsd-update.conf") > 0 && guestfs_is_file (g, "/etc/fstab") > 0) { - /* Ignore /dev/sda1 which is a shadow of the real root filesystem - * that is probably /dev/sda5 (see: - * http://www.fre...

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 ---

...y-guests/make-ubuntu-img.sh | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 02fdb2a..82e1254 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -217,7 +217,7 @@ check_filesystem (guestfs_h *g, const char *mountable, (is_dir_bin || (guestfs_is_symlink (g, "/bin") > 0 && guestfs_is_dir (g, "/usr/bin") > 0)) && - guestfs_is_file (g, "/etc/fstab") > 0) { + guestfs_is_file (g, "/etc/hosts") > 0) { fs->is_r...

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

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.