[Pkg-libvirt-commits] [libguestfs] 348/384: Revert "launch: libvirt: In debug messages use ls --lcontext instead of ls -Z."

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 32e5056f4a758f4a5553fe023d603c4708fa2efb
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Mar 11 17:24:59 2015 +0000

    Revert "launch: libvirt: In debug messages use ls --lcontext instead of ls -Z."
    
    The --lcontext option was removed from coreutils ls (in 2007, cough).
    
    Fedora carried a patch re-adding these options [I believe
    unintentionally], but that patch was dropped in Fedora 23, so the
    --lcontext option is gone for good.
    
    This reverts commit f9c5b4aa2a6e8890eb20e15165bbe6820e6011b5.
---
 src/launch-libvirt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index ab4fffc..45d0d76 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -863,7 +863,7 @@ debug_appliance_permissions (guestfs_h *g)
   guestfs_int_cmd_add_arg (cmd, "-a");
   guestfs_int_cmd_add_arg (cmd, "-l");
   guestfs_int_cmd_add_arg (cmd, "-R");
-  guestfs_int_cmd_add_arg (cmd, "--lcontext");
+  guestfs_int_cmd_add_arg (cmd, "-Z");
   guestfs_int_cmd_add_arg (cmd, appliance);
   guestfs_int_cmd_set_stdout_callback (cmd, debug_permissions_cb, NULL, 0);
   guestfs_int_cmd_run (cmd);
@@ -878,7 +878,7 @@ debug_socket_permissions (guestfs_h *g)
     guestfs_int_cmd_add_arg (cmd, "ls");
     guestfs_int_cmd_add_arg (cmd, "-a");
     guestfs_int_cmd_add_arg (cmd, "-l");
-    guestfs_int_cmd_add_arg (cmd, "--lcontext");
+    guestfs_int_cmd_add_arg (cmd, "-Z");
     guestfs_int_cmd_add_arg (cmd, g->tmpdir);
     guestfs_int_cmd_set_stdout_callback (cmd, debug_permissions_cb, NULL, 0);
     guestfs_int_cmd_run (cmd);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git