search for: do_llz

...; --- daemon/ls.c | 24 ++++++++++++++++++++++++ generator/actions.ml | 7 +++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/daemon/ls.c b/daemon/ls.c index d3689cd..fdacdaf 100644 --- a/daemon/ls.c +++ b/daemon/ls.c @@ -148,3 +148,27 @@ do_llz (const char *path) return out; /* caller frees */ } + +char * +do_ls_i (const char *dir) +{ + int r; + char *out; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *sdir = NULL; + + sdir = sysroot_path (dir); + if (!sdir) { + reply_with_perror ("malloc"); + return N...

...path); + CHROOT_IN; + rpath = realpath (path, NULL); + CHROOT_OUT; + if (rpath == NULL) { + reply_with_perror ("%s", path); + return NULL; + } + + spath = sysroot_path (rpath); if (!spath) { reply_with_perror ("malloc"); return NULL; @@ -131,9 +134,18 @@ do_llz (const char *path) int r; char *out; CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *rpath = NULL; CLEANUP_FREE char *spath = NULL; - spath = sysroot_path (path); + CHROOT_IN; + rpath = realpath (path, NULL); + CHROOT_OUT; + if (rpath == NULL) { + reply_with_perror (&quot...

The first patch preserves file mode, UID, GID and SELinux context across edited files. The second patch adds a useful new command in guestfish ('llz') which shows SELinux context (like 'ls -laZ') that was useful when debugging this. Rich.

...onst char *path) return NULL; } - r = command (&out, &err, "ls", "-la", spath, NULL); + r = command (&out, &err, str_ls, "-la", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); @@ -138,7 +140,7 @@ do_llz (const char *path) return NULL; } - r = command (&out, &err, "ls", "-laZ", spath, NULL); + r = command (&out, &err, str_ls, "-laZ", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); diff --git a/da...

...onst char *path) return NULL; } - r = command (&out, &err, "ls", "-la", spath, NULL); + r = command (&out, &err, str_ls, "-la", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); @@ -138,7 +140,7 @@ do_llz (const char *path) return NULL; } - r = command (&out, &err, "ls", "-laZ", spath, NULL); + r = command (&out, &err, str_ls, "-laZ", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); diff --git a/da...

...onst char *path) return NULL; } - r = command (&out, &err, str_ls, "-la", spath, NULL); + r = command (&out, &err, "ls", "-la", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -151,7 +149,7 @@ do_llz (const char *path) return NULL; } - r = command (&out, &err, str_ls, "-laZ", spath, NULL); + r = command (&out, &err, "ls", "-laZ", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); diff --git a/da...

...onst char *path) return NULL; } - r = command (&out, &err, str_ls, "-la", spath, NULL); + r = command (&out, &err, "ls", "-la", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -151,7 +151,7 @@ do_llz (const char *path) return NULL; } - r = command (&out, &err, str_ls, "-laZ", spath, NULL); + r = command (&out, &err, "ls", "-laZ", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); diff --git a/da...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

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

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.