summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>1999-03-07 22:59:55 (GMT)
committerH. Peter Anvin <hpa@zytor.com>1999-03-07 22:59:55 (GMT)
commitb31e0807dc5680f12e058709c2c4ca557bfa84ad (patch)
tree124daa7675adcd69d829d31fb6ceeb349032951f
parent62dc9a87942bb144aaaab809bf9f8844ff84d293 (diff)
downloadautofs3-b31e0807dc5680f12e058709c2c4ca557bfa84ad.zip
autofs3-b31e0807dc5680f12e058709c2c4ca557bfa84ad.tar.gz
autofs3-b31e0807dc5680f12e058709c2c4ca557bfa84ad.tar.bz2
autofs3-b31e0807dc5680f12e058709c2c4ca557bfa84ad.tar.xz
Use the autoconf-discovered initdir.
-rw-r--r--samples/Makefile3
-rw-r--r--samples/rc.autofs.in5
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/Makefile b/samples/Makefile
index 235ec91..3dd5015 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -16,4 +16,5 @@ install: all
install -c rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs
rc.autofs: rc.autofs.in
- sed -e "s|@@sbindir@@|$(sbindir)|g" < rc.autofs.in > rc.autofs
+ sed -e "s|@@sbindir@@|$(sbindir)|g" \
+ -e "s|@@initdir@@|$(initdir)|g" < rc.autofs.in > rc.autofs
diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
index 9e15bd6..86aa26a 100644
--- a/samples/rc.autofs.in
+++ b/samples/rc.autofs.in
@@ -20,9 +20,10 @@
FLAGS="defaults 21"
#
-# Location of the automount daemon
+# Location of the automount daemon and the init directory
#
DAEMON=@@sbindir@@/automount
+initdir=@@initdir@@
#
# Determine which kind of configuration we're using
@@ -30,10 +31,8 @@ DAEMON=@@sbindir@@/automount
system=unknown
if [ -f /etc/debian_version ]; then
system=debian
- initdir=/etc/init.d
elif [ -f /etc/redhat-release ]; then
system=redhat
- initdir=/etc/rc.d/init.d
else
echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2
exit 1