[PATCH] daemon: Choose /usr/sbin first for the daemon (debian bug 838995).

28 Sep 2016

Debian is also doing a UsrMove/UsrMerge:
https://wiki.debian.org/UsrMerge

However it is not finalized that Debian will actually make this
change.

Since some Debian systems have /sbin as a symlink and other have /sbin
as a real directory, and we should avoid choosing a symlinked
directory for the daemon, the easiest fix is simply to probe /usr/sbin
before /sbin since under all scenarios (and Fedora too) /usr/sbin is a
real directory.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838995
---
 m4/guestfs_daemon.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/guestfs_daemon.m4 b/m4/guestfs_daemon.m4
index 192583b..12123df 100644
--- a/m4/guestfs_daemon.m4
+++ b/m4/guestfs_daemon.m4
@@ -42,7 +42,7 @@ if test "x$enable_daemon" = "xyes"; then
     dnl install directory for libguestfs live.  Since Fedora 17
     dnl /sbin is a symlink to /usr/sbin.  We have to put the
     dnl daemon into a real (non-symlink) directory.
-    dirs="/sbin /usr/sbin /bin /usr/bin"
+    dirs="/usr/sbin /sbin /usr/bin /bin"
     AC_MSG_CHECKING([which of $dirs is a real directory])
     for dir in $dirs; do
         parent=`dirname $dir`
-- 
2.9.3

    

Richard W.M. Jones

Richard W.M. Jones

tags

participants (1)