|
 |
306fa1 |
autofs-5.0.7 - Handle new location of systemd
|
|
|
306fa1 |
|
|
|
306fa1 |
From: Frederic Crozat <fcrozat@suse.com>
|
|
|
306fa1 |
|
|
|
306fa1 |
Some distributions are moving systemd unit files from /lib to
|
|
|
306fa1 |
/usr/lib, so we need to test both directories.
|
|
|
306fa1 |
|
|
|
306fa1 |
edit: imk
|
|
|
306fa1 |
It occurs to me I've forgotten to check for the 64 bit variants
|
|
|
306fa1 |
of the directories, so add them as well.
|
|
|
306fa1 |
end edit: imk
|
|
|
306fa1 |
---
|
|
|
306fa1 |
|
|
|
306fa1 |
CHANGELOG | 1 +
|
|
|
306fa1 |
aclocal.m4 | 2 +-
|
|
|
306fa1 |
configure | 2 +-
|
|
|
306fa1 |
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
306fa1 |
|
|
|
306fa1 |
|
|
|
306fa1 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
306fa1 |
index 3bdf8a4..8f6bb3a 100644
|
|
|
306fa1 |
--- a/CHANGELOG
|
|
|
306fa1 |
+++ b/CHANGELOG
|
|
|
306fa1 |
@@ -14,6 +14,7 @@
|
|
|
306fa1 |
- allow non root user to check status.
|
|
|
306fa1 |
- fix recursive mount deadlock.
|
|
|
306fa1 |
- increase file map read buffer size.
|
|
|
306fa1 |
+- handle new location of systemd.
|
|
|
306fa1 |
|
|
|
306fa1 |
25/07/2012 autofs-5.0.7
|
|
|
306fa1 |
=======================
|
|
|
306fa1 |
diff --git a/aclocal.m4 b/aclocal.m4
|
|
|
306fa1 |
index 1798c8b..47bca0c 100644
|
|
|
306fa1 |
--- a/aclocal.m4
|
|
|
306fa1 |
+++ b/aclocal.m4
|
|
|
306fa1 |
@@ -234,7 +234,7 @@ AC_DEFUN([AF_WITH_SYSTEMD],
|
|
|
306fa1 |
[if test "$withval" = yes; then
|
|
|
306fa1 |
if test -z "$systemddir"; then
|
|
|
306fa1 |
AC_MSG_CHECKING([location of the systemd unit files directory])
|
|
|
306fa1 |
- for systemd_d in /lib/systemd/system; do
|
|
|
306fa1 |
+ for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do
|
|
|
306fa1 |
if test -z "$systemddir"; then
|
|
|
306fa1 |
if test -d "$systemd_d"; then
|
|
|
306fa1 |
systemddir="$systemd_d"
|
|
|
306fa1 |
diff --git a/configure b/configure
|
|
|
306fa1 |
index ba3bba6..3722a46 100755
|
|
|
306fa1 |
--- a/configure
|
|
|
306fa1 |
+++ b/configure
|
|
|
306fa1 |
@@ -2157,7 +2157,7 @@ if test "${with_systemd+set}" = set; then :
|
|
|
306fa1 |
if test -z "$systemddir"; then
|
|
|
306fa1 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5
|
|
|
306fa1 |
$as_echo_n "checking location of the systemd unit files directory... " >&6; }
|
|
|
306fa1 |
- for systemd_d in /lib/systemd/system; do
|
|
|
306fa1 |
+ for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do
|
|
|
306fa1 |
if test -z "$systemddir"; then
|
|
|
306fa1 |
if test -d "$systemd_d"; then
|
|
|
306fa1 |
systemddir="$systemd_d"
|