aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.lastrel2
-rw-r--r--Makefile7
-rw-r--r--Makefile.conf.in3
-rw-r--r--NEWS2
-rw-r--r--README6
-rw-r--r--aclocal.m418
-rw-r--r--autofs.spec113
-rw-r--r--configure.in6
-rw-r--r--man/Makefile15
-rw-r--r--man/auto.master.52
-rw-r--r--man/autofs.52
-rw-r--r--man/autofs.8.in (renamed from man/autofs.8)10
-rw-r--r--samples/Makefile15
13 files changed, 187 insertions, 14 deletions
diff --git a/.lastrel b/.lastrel
index ff365e0..0aec50e 100644
--- a/.lastrel
+++ b/.lastrel
@@ -1 +1 @@
-3.1.3
+3.1.4
diff --git a/Makefile b/Makefile
index 174cb10..5599c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@
-include Makefile.conf
include Makefile.rules
-.PHONY: daemon all kernel clean install install_kernel mrproper
-.PHONY: distclean backup
+.PHONY: daemon all kernel clean install install_kernel install_samples
+.PHONY: mrproper distclean backup
daemon:
for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
@@ -27,6 +27,9 @@ install:
install_kernel:
if [ -d kernel ]; then $(MAKE) -C kernel install; fi
+install_samples:
+ if [ -d samples ]; then $(MAKE) -C samples install; fi
+
mrproper distclean: clean
find . -noleaf \( -name '*~' -o -name '#*' -o -name '*.orig' -o -name '*.rej' -o -name '*.old' \) -print0 | xargs -0 rm -f
-rm -f include/config.h Makefile.conf config.* .autofs-*
diff --git a/Makefile.conf.in b/Makefile.conf.in
index 4a44e65..7651267 100644
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -42,3 +42,6 @@ sbindir = @sbindir@
# Where to install man pages
mandir = @mandir@
+
+# Location for init.d files
+initdir = @initdir@
diff --git a/NEWS b/NEWS
index 9e7fff9..d40d939 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
Since autofs-3.1.3:
-------------------
+* Merge in documentation changes from RedHat RPM.
+* Support installing the samples stuff (make install_samples).
Since autofs-3.1.2:
-------------------
diff --git a/README b/README
index f796c6b..181c7e6 100644
--- a/README
+++ b/README
@@ -7,6 +7,12 @@ pretending to be an NFS server. The result is simpler code, better
reliability, and much faster operation in the common case (everything
already mounted.)
+An AMD/AutoFS HOWTO is available at:
+
+http://www.Linux-Consulting.com/Amd_AutoFS/autofs.html
+
+... as well as from your favourite HOWTO archive.
+
To build autofs, please run:
./configure
diff --git a/aclocal.m4 b/aclocal.m4
index cf0fd92..696f6f2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -33,3 +33,21 @@ AC_DEFUN(AF_SLOPPY_MOUNT,
AC_MSG_RESULT(no)
fi
fi])
+
+dnl --------------------------------------------------------------------------
+dnl AF_INIT_D
+dnl
+dnl Check the location of the init.d directory
+dnl --------------------------------------------------------------------------
+AC_DEFUN(AF_INIT_D,
+[if test -z "$initdir"; then
+ AC_MSG_CHECKING([location of the init.d directory])
+ for init_d in /etc/init.d /etc/rc.d/init.d; do
+ if test -z "$initdir"; then
+ if test -d "$init_d"; then
+ initdir="$init_d"
+ AC_MSG_RESULT($initdir)
+ fi
+ fi
+ done
+fi])
diff --git a/autofs.spec b/autofs.spec
new file mode 100644
index 0000000..23fe42b
--- /dev/null
+++ b/autofs.spec
@@ -0,0 +1,113 @@
+Summary: autofs daemon
+Name: autofs
+%define version 3.1.4
+Version: %{version}
+Release: 1
+Copyright: GPL
+Group: Networking/Daemons
+Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/autofs-%{version}.tar.gz
+# Patch: autofs-3.1.1-rh.patch
+Buildroot: /var/tmp/autofs-tmp
+Prereq: chkconfig
+Requires: /bin/bash mktemp sed textutils sh-utils grep /bin/ps
+Summary(de): autofs daemon
+Summary(fr): démon autofs
+Summary(tr): autofs sunucu süreci
+Summary(sv): autofs-daemon
+
+%description
+autofs is a daemon which automatically mounts filesystems when you use
+them, and unmounts them later when you are not using them. This can
+include network filesystems, CD-ROMs, floppies, and so forth.
+
+%description -l de
+autofs ist ein Dämon, der Dateisysteme automatisch montiert, wenn sie
+benutzt werden, und sie später bei Nichtbenutzung wieder demontiert.
+Dies kann Netz-Dateisysteme, CD-ROMs, Disketten und ähnliches einschließen.
+
+%description -l fr
+autofs est un démon qui monte automatiquement les systèmes de fichiers
+lorsqu'on les utilise et les démonte lorsqu'on ne les utilise plus. Cela
+inclus les systèmes de fichiers réseau, les CD-ROMs, les disquettes, etc.
+
+%description -l tr
+autofs, kullanýlan dosya sistemlerini gerek olunca kendiliðinden baðlar
+ve kullanýmlarý sona erince yine kendiliðinden çözer. Bu iþlem, að dosya
+sistemleri, CD-ROM'lar ve disketler üzerinde yapýlabilir.
+
+%description -l sv
+autofs är en daemon som mountar filsystem när de använda, och senare
+unmountar dem när de har varit oanvända en bestämd tid. Detta kan
+inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
+
+%prep
+%setup -q
+# %patch -p1 -b .rh
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/lib/autofs
+mkdir -p $RPM_BUILD_ROOT/usr/man/man5
+mkdir -p $RPM_BUILD_ROOT/usr/man/man8
+
+make install INSTALLROOT=$RPM_BUILD_ROOT
+make install_samples INSTALLROOT=$RPM_BUILD_ROOT
+install -m 755 -d $RPM_BUILD_ROOT/misc
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+chkconfig --add autofs
+
+%postun
+if [ "$1" = 0 ] ; then
+ chkconfig --del autofs
+fi
+
+%files
+%defattr(-,root,root)
+%doc COPYRIGHT NEWS README TODO
+%config /etc/rc.d/init.d/autofs
+%config /etc/auto.master
+%config(missingok) /etc/auto.misc
+/usr/sbin/automount
+%dir /misc
+/usr/lib/autofs
+/usr/man/*/*
+
+%changelog
+* Tue Oct 6 1998 Bill Nottingham <notting@redhat.com>
+- fix bash2 breakage in init script
+
+* Sun Aug 23 1998 Jeff Johnson <jbj@redhat.com>
+- typo in man page.
+
+* Mon Jul 20 1998 Jeff Johnson <jbj@redhat.com>
+- added sparc to ExclusiveArch.
+
+* Thu May 07 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
+
+* Thu Apr 30 1998 Cristian Gafton <gafton@redhat.com>
+- updated to 3.1.1
+
+* Wed Apr 22 1998 Michael K. Johnson <johnsonm@redhat.com>
+- enhanced initscripts
+
+* Fri Dec 05 1997 Michael K. Johnson <johnsonm@redhat.com>
+- Link with -lnsl for glibc compliance.
+
+* Thu Oct 23 1997 Michael K. Johnson <johnsonm@redhat.com>
+- exclusivearch for i386 for now, since our kernel packages on
+ other platforms don't include autofs yet.
+- improvements to initscripts.
+
+* Thu Oct 16 1997 Michael K. Johnson <johnsonm@redhat.com>
+- Built package from 0.3.14 for 5.0
diff --git a/configure.in b/configure.in
index 3f96459..70fddd6 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,12 @@ AC_CHECK_HEADER(rpcsvc/nis.h, HAVE_NISPLUS=1)
AC_SUBST(HAVE_NISPLUS)
#
+# Location of init.d directory?
+#
+AF_INIT_D()
+AC_SUBST(initdir)
+
+#
# Write Makefile.conf and include/config.h
#
AC_CONFIG_HEADER(include/config.h)
diff --git a/man/Makefile b/man/Makefile
index e6a4d4e..bab0aef 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -3,11 +3,18 @@
-include ../Makefile.conf
include ../Makefile.rules
-install:
+GENFILES = $(patsubst %.in, %, $(wildcard *.[58].in))
+
+.SUFFIXES: .in
+
+.in:
+ sed -e 's/@@INIT.D@@/$(initdir)/g' < $< > $@
+
+all: $(GENFILES)
+
+install: all
install -c *.5 -m 644 $(INSTALLROOT)$(mandir)/man5
install -c *.8 -m 644 $(INSTALLROOT)$(mandir)/man8
-all:
-
clean:
-
+ rm -f $(GENFILES)
diff --git a/man/auto.master.5 b/man/auto.master.5
index 8ecf72e..7e95f75 100644
--- a/man/auto.master.5
+++ b/man/auto.master.5
@@ -32,7 +32,7 @@ The file has three fields separated by an arbitrary number of blanks or
tabs. Lines beginning with # are comments. The first field is the mount
point. Second field is the map file to be consulted for this mount-point.
The third field is optional and can contain options to be applied to all
-entries in the map. Options are cumulative which is a difference to the
+entries in the map. Options are cumulative, which is a difference to the
behavior of the SunOS automounter.
The format of the map file and the options are described in
diff --git a/man/autofs.5 b/man/autofs.5
index 015e333..ecd1c56 100644
--- a/man/autofs.5
+++ b/man/autofs.5
@@ -79,7 +79,7 @@ An & character in the
is expanded to the value of the
.B key
field that matched the line (which probably only makes sense together with
-a wildchard key).
+a wildcard key).
.SS Wildcard Key
A * in the
.B key
diff --git a/man/autofs.8 b/man/autofs.8.in
index 8e00d0a..2741c86 100644
--- a/man/autofs.8
+++ b/man/autofs.8.in
@@ -1,9 +1,9 @@
.\" $Id$
.TH AUTOFS 8 "9 Sep 1997"
.SH NAME
-/etc/init.d/autofs \- Control Script for automounter
+@@INIT.D@@/autofs \- Control Script for automounter
.SH SYNOPSIS
-.B /etc/init.d/autofs
+.B @@INIT.D@@/autofs
.I start|stop|reload
.SH "DESCRIPTION"
.B autofs
@@ -30,7 +30,7 @@ to find mount points on the system. For each of those mount points a
.BR automount (8)
process is started with the appropriate parameters. You can check the
active mount points for the automounter with the
-.B /etc/init.d/autofs status
+.B @@INIT.D@@/autofs status
command. After the
.I auto.master
configuration file is processed the
@@ -39,7 +39,7 @@ script will check for an NIS map with the same name. If such a map exists
then that map will be processed in the same way as the auto.master map. The
NIS map will be processed last.
.P
-.B /etc/init.d/autofs reload
+.B @@INIT.D@@/autofs reload
will check the current auto.master map against running daemons. It will kill
those daemons whose entries have changed and then start daemons for new or
changed entries.
@@ -51,7 +51,7 @@ map is modified then the
.B autofs
script must be rerun to activate the changes.
.P
-.B /etc/init.d/autofs status
+.B @@INIT.D@@/autofs status
will display the current configuration and a list of currently running
automount daemons.
.SH "SEE ALSO"
diff --git a/samples/Makefile b/samples/Makefile
new file mode 100644
index 0000000..4e7ebf4
--- /dev/null
+++ b/samples/Makefile
@@ -0,0 +1,15 @@
+# $Id$
+
+-include ../Makefile.conf
+include ../Makefile.rules
+
+all:
+
+clean:
+
+install: all
+ -mv -f $(INSTALLROOT)/etc/auto.master $(INSTALLROOT)/etc/auto.master.old
+ install -c auto.master -m 644 $(INSTALLROOT)/etc
+ -mv -f $(INSTALLROOT)/etc/auto.misc $(INSTALLROOT)/etc/auto.misc.old
+ install -c auto.misc -m 644 $(INSTALLROOT)/etc
+ install -c rc.autofs -m 744 $(INSTALLROOT)$(initdir)/autofs