summaryrefslogtreecommitdiff
path: root/contrib/amd/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/amd/scripts')
-rw-r--r--contrib/amd/scripts/Makefile.am2
-rw-r--r--contrib/amd/scripts/Makefile.in10
-rw-r--r--contrib/amd/scripts/amd.conf.516
-rwxr-xr-xcontrib/amd/scripts/ctl-amd.in8
-rwxr-xr-xcontrib/amd/scripts/ctl-hlfsd.in6
-rw-r--r--contrib/amd/scripts/expn.12
-rwxr-xr-xcontrib/amd/scripts/expn.in2
-rwxr-xr-xcontrib/amd/scripts/fixrmtab (renamed from contrib/amd/scripts/fixrmtab.in)0
8 files changed, 18 insertions, 28 deletions
diff --git a/contrib/amd/scripts/Makefile.am b/contrib/amd/scripts/Makefile.am
index c4380584ec0e..9ebd6914cb6c 100644
--- a/contrib/amd/scripts/Makefile.am
+++ b/contrib/amd/scripts/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
amd2sun.in \
ctl-amd.in \
ctl-hlfsd.in \
- fixrmtab.in \
+ fixrmtab \
fix-amd-map.in \
lostaltmail.in \
wait4amd.in \
diff --git a/contrib/amd/scripts/Makefile.in b/contrib/amd/scripts/Makefile.in
index a20d84627136..1c69cec2aecf 100644
--- a/contrib/amd/scripts/Makefile.in
+++ b/contrib/amd/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.3.1 from Makefile.am
# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -106,7 +106,7 @@ EXTRA_DIST = \
amd2sun.in \
ctl-amd.in \
ctl-hlfsd.in \
- fixrmtab.in \
+ fixrmtab \
fix-amd-map.in \
lostaltmail.in \
wait4amd.in \
@@ -122,7 +122,7 @@ CLEANFILES = $(sbin_SCRIPTS) $(bin_SCRIPTS)
mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = am-eject amd2ldif amd2sun ctl-amd ctl-hlfsd expn \
-fixrmtab fix-amd-map lostaltmail wait4amd wait4amd2die
+fix-amd-map lostaltmail wait4amd wait4amd2die
SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
man1dir = $(mandir)/man1
@@ -133,7 +133,7 @@ NROFF = nroff
DATA = $(sysconf_DATA)
DIST_COMMON = Makefile.am Makefile.in am-eject.in amd2ldif.in \
-amd2sun.in ctl-amd.in ctl-hlfsd.in expn.in fix-amd-map.in fixrmtab.in \
+amd2sun.in ctl-amd.in ctl-hlfsd.in expn.in fix-amd-map.in \
lostaltmail.in wait4amd.in wait4amd2die.in
@@ -163,8 +163,6 @@ ctl-hlfsd: $(top_builddir)/config.status ctl-hlfsd.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
expn: $(top_builddir)/config.status expn.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-fixrmtab: $(top_builddir)/config.status fixrmtab.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
fix-amd-map: $(top_builddir)/config.status fix-amd-map.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
lostaltmail: $(top_builddir)/config.status lostaltmail.in
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index 1f3472000b98..b652e9d87252 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -38,7 +38,7 @@
.\"
.\" %W% (Berkeley) %G%
.\"
-.\" $Id: amd.conf.5,v 1.5 1998/11/20 08:12:05 obrien Exp $
+.\" $Id: amd.conf.5,v 1.3 1998/09/05 06:56:36 obrien Exp $
.\"
.Dd April 7, 1997
.Dt AMD.CONF 5
@@ -60,8 +60,8 @@ automounter program.
.Sh FILE FORMAT
The file consists of sections and parameters. A section begins with the
name of the section in square brackets and continues until the next section
-begins or the end of the file is reached. Sections contain parameters of
-the form
+begins or the end the file is reached. Sections contain parameters of the
+form
.Sq name = value .
.Pp
The file is line-based - that is, each newline-terminated line represents
@@ -121,7 +121,7 @@ If
then amd's top-level mount points will be browsable to
.Xr readdir 3
calls. This means you could run for example
-.Xr ls 1
+.Xr ls 3
and see what keys are available to mount in that directory. Not all entries
are made visible to
.Xr readdir 3 :
@@ -222,7 +222,7 @@ cluster to use.
Same as the
.Fl D
option to
-.Nm amd .
+.Fl amd .
Specify any debugging options for
.Nm amd .
Works only if am-utils was configured for debugging using the
@@ -577,7 +577,7 @@ follows:
wire==slip-net;opts:=intr,rsize=1024,wsize=1024 \\
wire!=slip-net;opts:=intr,rsize=8192,wsize=8192
.Ed
-.It Nm show_statfs_entries (boolean, default=no)
+.It Nm show_statfs_entries (boolean), default=no)
If
.Dq yes ,
then all maps which are browsable will also show the number of entries
@@ -588,7 +588,7 @@ runs.
.Po This is accomplished by returning non-zero values to the
.Xr statfs 2
.Pc system call .
-.It Nm unmount_on_exist (boolean, default=no)
+.It Nm unmount_on_exist (boolean), default=no)
If
.Dq yes ,
then
@@ -601,7 +601,7 @@ leaves all
mounted filesystems intact. Note that
.Nm amd
does not know about file systems mounted before it starts up, unless the
-.Ar restart_mounts
+.AR restart_mounts
option or
.Fl r
flag are used.
diff --git a/contrib/amd/scripts/ctl-amd.in b/contrib/amd/scripts/ctl-amd.in
index 8eefde27feb1..665a7dd89643 100755
--- a/contrib/amd/scripts/ctl-amd.in
+++ b/contrib/amd/scripts/ctl-amd.in
@@ -4,10 +4,6 @@
#
# Package: am-utils-6.0
# Author: Erez Zadok <ezk@cs.columbia.edu>
-#
-# chkconfig: 345 72 8
-# description: amd is the Berkeley AutoMount Daemon, used for \
-# automatic filesystem mounting
# set path
prefix=@prefix@
@@ -94,14 +90,14 @@ case "$1" in
'stop')
# prepend space to program name to ensure only amd process dies
- echo "killing amd..."
killproc " amd"
- wait4amd2die
;;
'restart')
# kill amd, wait for it to die, then restart
+ echo "killing amd..."
ctl-amd stop
+ wait4amd2die
if [ $? != 0 ]
then
echo "NOT restarting amd!"
diff --git a/contrib/amd/scripts/ctl-hlfsd.in b/contrib/amd/scripts/ctl-hlfsd.in
index e574d0d35393..a6e97f68edd9 100755
--- a/contrib/amd/scripts/ctl-hlfsd.in
+++ b/contrib/amd/scripts/ctl-hlfsd.in
@@ -4,10 +4,6 @@
#
# Package: am-utils-6.0
# Author: Erez Zadok <ezk@cs.columbia.edu>
-#
-# chkconfig: 345 73 7
-# description: hlfsd is a daemon similar to amd, used to redirect user
-# mail to home directory of the user
# set path
prefix=@prefix@
@@ -94,7 +90,7 @@ case "$1" in
echo "killing hlfsd..."
ctl-hlfsd stop
echo "Waiting for 10 seconds..."
- sleep 10 # hope that would be enough
+ sleep 10 # hope that's enough
echo "Restarting hlfsd..."
ctl-hlfsd start
;;
diff --git a/contrib/amd/scripts/expn.1 b/contrib/amd/scripts/expn.1
index 5795241e8584..b2bd1b6f6ed3 100644
--- a/contrib/amd/scripts/expn.1
+++ b/contrib/amd/scripts/expn.1
@@ -16,7 +16,7 @@ $sockaddr = 'S n a4 x8';
# system requirements:
# must have 'nslookup' and 'hostname' programs.
-# $Header: /src/cvsroot/am-utils-6.0/scripts/expn.1,v 1.1.1.1 1998/11/05 02:04:58 ezk Exp $
+# $Header: /home/muir/bin/RCS/expn,v 3.9 1995/10/02 17:51:35 muir Exp muir $
# TODO:
# less magic should apply to command-line addresses
diff --git a/contrib/amd/scripts/expn.in b/contrib/amd/scripts/expn.in
index 5bd4200ef013..b2bd1b6f6ed3 100755
--- a/contrib/amd/scripts/expn.in
+++ b/contrib/amd/scripts/expn.in
@@ -16,7 +16,7 @@ $sockaddr = 'S n a4 x8';
# system requirements:
# must have 'nslookup' and 'hostname' programs.
-# $Header: /src/cvsroot/am-utils-6.0/scripts/expn.in,v 1.1.1.1 1998/11/05 02:04:57 ezk Exp $
+# $Header: /home/muir/bin/RCS/expn,v 3.9 1995/10/02 17:51:35 muir Exp muir $
# TODO:
# less magic should apply to command-line addresses
diff --git a/contrib/amd/scripts/fixrmtab.in b/contrib/amd/scripts/fixrmtab
index 33b7bcfdb6ce..33b7bcfdb6ce 100755
--- a/contrib/amd/scripts/fixrmtab.in
+++ b/contrib/amd/scripts/fixrmtab
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 08:15:16 +0000