search for: os_format_installed

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

...uot;) > 0 && - guestfs_is_dir (g, "/usr/bin") > 0)) && + is_symlink_to (g, "/bin", "usr/bin") > 0) && guestfs_is_file (g, "/etc/fstab") > 0) { fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; @@ -366,6 +366,22 @@ get_partition_context (guestfs_h *g, const char *partition, return 0; } +static int +is_symlink_to (guestfs_h *g, const char *file, const char *wanted_target) +{ + CLEANUP_FREE char *target = NULL; + + if (guestfs_is_symlink (g, file) == 0) + return 0; + + target =...

The osinfo has an "installer" attribute in <media>, which defaults to true, and there are few entries which are marked as not. --- src/guestfs-internal.h | 1 + src/inspect-fs-cd.c | 3 ++- src/osinfo.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 03f1034..2b49011 100644 ---

...is_dir (g, "/usr/bin") > 0)) && - guestfs_is_file (g, "/etc/fstab") > 0) { + (guestfs_is_file (g, "/etc/fstab") > 0 || + guestfs_is_file (g, "/etc/hosts") > 0)) { fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; if (guestfs_int_check_linux_root (g, fs) == -1) -- 2.5.0

...ystem - * that is probably /dev/sda5 (see: - * http://www.freebsd.org/doc/handbook/disk-organization.html) - */ - if (m->im_type == MOUNTABLE_DEVICE && - match (g, m->im_device, re_first_partition)) - return 0; - fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; if (guestfs___check_freebsd_root (g, fs) == -1) @@ -225,14 +250,6 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_file (g, "/netbsd") > 0 && guestfs_is_file (g, "/etc/fstab") > 0 && guestfs_is_f...

Small cleanup helper to dispose xmlChar* buffers. --- src/cleanup.c | 9 +++++++++ src/guestfs-internal-frontend.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/cleanup.c b/src/cleanup.c index 1aa3051..6c4558c 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -106,6 +106,15 @@ guestfs_int_cleanup_unlink_free (char **ptr) } void +guestfs_int_cleanup_xmlFree

Check for filesystem.squashfs also in /live, since it is where live-build places it. --- src/inspect-fs-cd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index 407e4f8..eaeaa6f 100644 --- a/src/inspect-fs-cd.c +++ b/src/inspect-fs-cd.c @@ -429,7 +429,8 @@ guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs) *

On Thu, Nov 28, 2013 at 02:48:38PM +0100, Pino Toscano wrote: > Check for /boot/loader.rc as "install disc" detection, using it to mark > FreeBSD install discs. > Also, check for /mfsroot.gz to see whether such disc is also a live one. > > See also RHBZ#1033207. > --- > src/inspect-fs-cd.c | 19 ++++++++++++++++++- > src/inspect-fs.c | 3 ++- > 2 files

...file (g, "/etc/hosts") > 0)) { /etc/hosts could be present on any UNIX pretty much (so could /etc/fstab for that matter). If you want Linux then how about /lib/ld-linux.so.2 which exists on any Linux with ELF library support. > fs->is_root = 1; > fs->format = OS_FORMAT_INSTALLED; > if (guestfs_int_check_linux_root (g, fs) == -1) Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.or...

...gt; - guestfs_is_dir (g, "/usr/bin") > 0)) && > + is_symlink_to (g, "/bin", "usr/bin") > 0) && > guestfs_is_file (g, "/etc/fstab") > 0) { > fs->is_root = 1; > fs->format = OS_FORMAT_INSTALLED; > @@ -366,6 +366,22 @@ get_partition_context (guestfs_h *g, const char *partition, > return 0; > } > > +static int > +is_symlink_to (guestfs_h *g, const char *file, const char *wanted_target) > +{ > + CLEANUP_FREE char *target = NULL; > + > + if (guestfs_is_sy...

...;/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)) { fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; if (guestfs_int_check_linux_root (g, fs) == -1) -- 2.5.5

Check for /boot/loader.rc as "install disc" detection, using it to mark FreeBSD install discs. Also, check for /mfsroot.gz to see whether such disc is also a live one. See also RHBZ#1033207. --- src/inspect-fs-cd.c | 19 ++++++++++++++++++- src/inspect-fs.c | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index

Check for /boot/loader.rc as "install disc" detection, using it to mark FreeBSD install discs. Also, check for /mfsroot.gz to see whether such disc is also a live one. See also RHBZ#1033207. --- src/inspect-fs-cd.c | 8 +++++++- src/inspect-fs.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index eaeaa6f..45d7bb5

...p; + 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; + if (guestfs___check_minix_root (g, fs) == -1) + return -1; + } /* Linux root? */ else if (is_dir_etc && (is_dir_bin || diff --git a/src/inspect-icon.c b/src/inspect-icon.c index 94b63a2..0ffca72 100644 --- a/src/inspect-icon.c +++ b/src/inspect-icon.c @@ -197,6...

...c && + is_dir_bin && + guestfs_is_file (g, "/bsd") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/motd") > 0) { + fs->is_root = 1; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs___check_openbsd_root (g, fs) == -1) + return -1; + } /* Hurd root? */ else if (guestfs_is_file (g, "/hurd/console") > 0 && guestfs_is_file (g, "/hurd/hello") > 0 && -- 2.1.3

...c && + is_dir_bin && + guestfs_is_file (g, "/bsd") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/motd") > 0) { + fs->is_root = 1; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs___check_openbsd_root (g, fs) == -1) + return -1; + } /* Hurd root? */ else if (guestfs_is_file (g, "/hurd/console") > 0 && guestfs_is_file (g, "/hurd/hello") > 0 && -- 2.1.3

...ymlink (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_root = 1; fs->format = OS_FORMAT_INSTALLED; if (guestfs_int_check_linux_root (g, fs) == -1) diff --git a/test-data/phony-guests/make-archlinux-img.sh b/test-data/phony-guests/make-archlinux-img.sh index 066df09..f748171 100755 --- a/test-data/phony-guests/make-archlinux-img.sh +++ b/test-data/phony-guests/make-archlinux-img.sh @@ -45,6...

...g, "/root") > 0 && + guestfs_is_dir (g, "/home") > 0 && + guestfs_is_dir (g, "/usr") > 0 && + 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")...

...g, "/root") > 0 && + guestfs_is_dir (g, "/home") > 0 && + guestfs_is_dir (g, "/usr") > 0 && + 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")...

...t char *mountable, guestfs_is_dir (g, "/spool") > 0) ; /* Windows root? */ - else if (guestfs___has_windows_systemroot (g) >= 0) { + else if ((windows_systemroot = guestfs___get_windows_systemroot (g)) != NULL) + { fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; - if (guestfs___check_windows_root (g, fs) == -1) + if (guestfs___check_windows_root (g, fs, windows_systemroot) == -1) return -1; } /* Windows volume with installed applications (but not root)? */ -- 1.8.2.1