[Libguestfs] [PATCH 20/46] daemon: Remove unnecessary sysroot_path (selinux).

Richard W.M. Jones rjones at redhat.com
Sat Aug 24 12:36:56 UTC 2013


From: "Richard W.M. Jones" <rjones at redhat.com>

This fixes commit 72afcf450a78b7e58f65b4a7aaf94d71cd25fca5.

(cherry picked from commit 7367729ec7a5d016878dd00b32cce45cec372931)
(cherry picked from commit 576379a3478ced0483102c797935b57f454a1f7d)
---
 daemon/command.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/daemon/command.c b/daemon/command.c
index fde3826..db82b52 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -44,7 +44,7 @@ do_command (char *const *argv)
   CLEANUP_FREE char *err;
   int r;
   CLEANUP_FREE char *sysroot_dev = NULL, *sysroot_dev_pts = NULL,
-    *sysroot_proc = NULL, *sysroot_selinux = NULL, *sysroot_sys = NULL;
+    *sysroot_proc = NULL, *sysroot_sys = NULL;
   int dev_ok, dev_pts_ok, proc_ok, sys_ok;
 
   /* We need a root filesystem mounted to do this. */
@@ -70,12 +70,10 @@ do_command (char *const *argv)
   sysroot_dev = sysroot_path ("/dev");
   sysroot_dev_pts = sysroot_path ("/dev/pts");
   sysroot_proc = sysroot_path ("/proc");
-  sysroot_selinux = sysroot_path ("/sys/fs/selinux");
   sysroot_sys = sysroot_path ("/sys");
 
   if (sysroot_dev == NULL || sysroot_dev_pts == NULL ||
-      sysroot_proc == NULL || sysroot_selinux == NULL ||
-      sysroot_sys == NULL) {
+      sysroot_proc == NULL || sysroot_sys == NULL) {
     reply_with_perror ("malloc");
     return NULL;
   }
-- 
1.8.3.1




More information about the Libguestfs mailing list