[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/sid] 2 commits: Prefer /sbin over /usr/sbin

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / libvirt


Commits:
305c431e by Guido Günther at 2018-04-08T11:12:03+02:00
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

- - - - -
a7198e5d by Guido Günther at 2018-04-08T11:12:13+02:00
Document changes and release 4.2.0-2

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/debian/Prefer-sbin-over-usr-sbin.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libvirt (4.2.0-2) unstable; urgency=medium
+
+  * [c859ce5] 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)
+
+ -- Guido Günther <agx at sigxcpu.org>  Sun, 08 Apr 2018 11:05:14 +0200
+
 libvirt (4.2.0-1) unstable; urgency=medium
 
   [ Laurent Bigonville ]


=====================================
debian/patches/debian/Prefer-sbin-over-usr-sbin.patch
=====================================
--- /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 at 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


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/f53db44e17bd3a15f67d2bd8530beec79d94fa69...a7198e5ddcf5abcd76ac003d4840ffb63e8630c4

---
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/f53db44e17bd3a15f67d2bd8530beec79d94fa69...a7198e5ddcf5abcd76ac003d4840ffb63e8630c4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-libvirt-commits/attachments/20180408/18114d71/attachment-0001.html>