search for: sysroot_etc_resolv_conf

...bool mounted; - char *sysroot_dev; - char *sysroot_dev_pts; - char *sysroot_proc; - char *sysroot_selinux; - char *sysroot_sys; - char *sysroot_sys_fs_selinux; - bool dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok, sys_fs_selinux_ok; -}; - -struct resolver_state { - bool mounted; - char *sysroot_etc_resolv_conf; - char *sysroot_etc_resolv_conf_old; -}; - -/* While running the command, bind-mount /dev, /proc, /sys - * into the chroot. However we must be careful to unmount them - * afterwards because otherwise they would interfere with - * future mount and unmount operations. - * - * We deliberately allow...

This is a more working version. Inspection (partially) succeeds on a real guest this time :-) You can test it out on a real guest (in this case, a CentOS disk image located at /tmp/centos-6.img) by doing: $ ./run guestfish -v -x -a /tmp/centos-6.img ><fs> run ><fs> debug sh "guestfs-inspection --verbose" which will print lots of debugging, and at the end the

For background on this change, see: https://rwmj.wordpress.com/2015/12/06/inspection-now-with-added-prolog/ v2 was previously posted here: https://www.redhat.com/archives/libguestfs/2015-December/msg00038.html To test this patch series on a real guest, you can do: $ ./run guestfish -v -x -a /var/tmp/centos-6.img ><fs> run ><fs> debug sh "guestfs-inspection

...etc/resolv.conf is out the way, we * can create our own copy of the appliance /etc/resolv.conf. */ - ignore_value (command (NULL, NULL, "cp", "/etc/resolv.conf", + ignore_value (command (NULL, NULL, str_cp, "/etc/resolv.conf", rs->sysroot_etc_resolv_conf, NULL)); rs->mounted = true; diff --git a/daemon/debug.c b/daemon/debug.c index 9fe57fc..b5470d7 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -41,6 +41,7 @@ GUESTFSD_EXT_CMD(str_xargs, xargs); GUESTFSD_EXT_CMD(str_file, file); GUESTFSD_EXT_CMD(str_grep, grep); GUESTFSD_EXT_CMD(str...

Various changes/fixes to use smaller stack frames. Rich.

...n"); xdr_destroy (&xdr); diff --git a/daemon/sh.c b/daemon/sh.c index c4efa5b..94f348b 100644 --- a/daemon/sh.c +++ b/daemon/sh.c @@ -160,6 +160,7 @@ static int set_up_etc_resolv_conf (struct resolver_state *rs) { struct stat statbuf; + CLEANUP_FREE char *buf = NULL; rs->sysroot_etc_resolv_conf_old = NULL; @@ -174,11 +175,11 @@ set_up_etc_resolv_conf (struct resolver_state *rs) * that on Ubuntu it's a dangling symlink. */ if (lstat (rs->sysroot_etc_resolv_conf, &statbuf) == 0) { - size_t len = sysroot_len + 32; - char buf[len]; - /* Make a random name fo...

...etc/resolv.conf is out the way, we * can create our own copy of the appliance /etc/resolv.conf. */ - ignore_value (command (NULL, NULL, str_cp, "/etc/resolv.conf", + ignore_value (command (NULL, NULL, "cp", "/etc/resolv.conf", rs->sysroot_etc_resolv_conf, NULL)); rs->mounted = true; diff --git a/daemon/sleuthkit.c b/daemon/sleuthkit.c index bdbdb0f89..acda48bc9 100644 --- a/daemon/sleuthkit.c +++ b/daemon/sleuthkit.c @@ -31,9 +31,6 @@ static int send_command_output (const char *cmd); -GUESTFSD_EXT_CMD(str_icat, icat); -GUESTFSD_EXT_CMD...

...etc/resolv.conf is out the way, we * can create our own copy of the appliance /etc/resolv.conf. */ - ignore_value (command (NULL, NULL, str_cp, "/etc/resolv.conf", + ignore_value (command (NULL, NULL, "cp", "/etc/resolv.conf", rs->sysroot_etc_resolv_conf, NULL)); rs->mounted = true; diff --git a/daemon/sleuthkit.c b/daemon/sleuthkit.c index bdbdb0f89..bde506ac4 100644 --- a/daemon/sleuthkit.c +++ b/daemon/sleuthkit.c @@ -31,8 +31,7 @@ static int send_command_output (const char *cmd); -GUESTFSD_EXT_CMD(str_icat, icat); -GUESTFSD_EXT_CMD...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’