diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-04-08 11:04:41 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-04-08 11:12:03 +0200 |
| commit | 305c431eff6d6982128906c3449c57900df20e64 (patch) | |
| tree | 1b6041aa386fd3bc7710f5fb7005e61b76488aed | |
| parent | f53db44e17bd3a15f67d2bd8530beec79d94fa69 (diff) | |
Prefer /sbin over /usr/sbin
If libvirt is built in a chroot with merged /usr it will otherwise break
on non /usr merged systems.
Closes: #895145
| -rw-r--r-- | debian/patches/debian/Prefer-sbin-over-usr-sbin.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch b/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch new file mode 100644 index 000000000..5d0dc9539 --- /dev/null +++ b/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch @@ -0,0 +1,25 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org> +Date: Sun, 8 Apr 2018 11:02:52 +0200 +Subject: Prefer /sbin over /usr/sbin + +If libvirt is built in a chroot with merged /usr it will otherwise +break on non /usr merged systems. + +Closes: #895145 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 115eb60..df1ad85 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,7 +110,7 @@ then + fi + + dnl Where we look for daemons and admin binaries during configure +-LIBVIRT_SBIN_PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" ++LIBVIRT_SBIN_PATH="/sbin:$PATH:/usr/sbin:/usr/local/sbin" + + dnl Checks for C compiler. + AC_PROG_CC diff --git a/debian/patches/series b/debian/patches/series index e1c83ed77..e9a402e32 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ debian/apparmor_profiles_local_include.patch Set-defaults-for-zfs-tools.patch Pass-GPG_TTY-env-var-to-the-ssh-binary.patch apparmor-Allow-virt-aa-helper-to-access-the-name-service-.patch +debian/Prefer-sbin-over-usr-sbin.patch |