diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
commit | 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch) | |
tree | 0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch | |
download | meta-openembedded-daisy-140929.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch new file mode 100644 index 0000000000..1c26794f50 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-handle-new-location-of-systemd.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | autofs-5.0.7 - Handle new location of systemd | ||
2 | |||
3 | From: Frederic Crozat <fcrozat@suse.com> | ||
4 | |||
5 | Some distributions are moving systemd unit files from /lib to | ||
6 | /usr/lib, so we need to test both directories. | ||
7 | |||
8 | edit: imk | ||
9 | It occurs to me I've forgotten to check for the 64 bit variants | ||
10 | of the directories, so add them as well. | ||
11 | end edit: imk | ||
12 | --- | ||
13 | |||
14 | CHANGELOG | 1 + | ||
15 | aclocal.m4 | 2 +- | ||
16 | configure | 2 +- | ||
17 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
18 | |||
19 | |||
20 | diff --git a/CHANGELOG b/CHANGELOG | ||
21 | index 3bdf8a4..8f6bb3a 100644 | ||
22 | --- a/CHANGELOG | ||
23 | +++ b/CHANGELOG | ||
24 | @@ -14,6 +14,7 @@ | ||
25 | - allow non root user to check status. | ||
26 | - fix recursive mount deadlock. | ||
27 | - increase file map read buffer size. | ||
28 | +- handle new location of systemd. | ||
29 | |||
30 | 25/07/2012 autofs-5.0.7 | ||
31 | ======================= | ||
32 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
33 | index 1798c8b..47bca0c 100644 | ||
34 | --- a/aclocal.m4 | ||
35 | +++ b/aclocal.m4 | ||
36 | @@ -234,7 +234,7 @@ AC_DEFUN([AF_WITH_SYSTEMD], | ||
37 | [if test "$withval" = yes; then | ||
38 | if test -z "$systemddir"; then | ||
39 | AC_MSG_CHECKING([location of the systemd unit files directory]) | ||
40 | - for systemd_d in /lib/systemd/system; do | ||
41 | + for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do | ||
42 | if test -z "$systemddir"; then | ||
43 | if test -d "$systemd_d"; then | ||
44 | systemddir="$systemd_d" | ||
45 | diff --git a/configure b/configure | ||
46 | index ba3bba6..3722a46 100755 | ||
47 | --- a/configure | ||
48 | +++ b/configure | ||
49 | @@ -2157,7 +2157,7 @@ if test "${with_systemd+set}" = set; then : | ||
50 | if test -z "$systemddir"; then | ||
51 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5 | ||
52 | $as_echo_n "checking location of the systemd unit files directory... " >&6; } | ||
53 | - for systemd_d in /lib/systemd/system; do | ||
54 | + for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do | ||
55 | if test -z "$systemddir"; then | ||
56 | if test -d "$systemd_d"; then | ||
57 | systemddir="$systemd_d" | ||