merge conflicts
This commit is contained in:
christos
parent
4bcd344e8f
commit
1400370530
|
|
@ -1,7 +1,67 @@
|
|||
2009-03-20 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Fix largefile re-definitions
|
||||
|
||||
* Fix compilation error caused in previous patch
|
||||
|
||||
2009-02-19 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Add a synchronous unmount amq rpc that will wait for the remote
|
||||
filesystem to be unmounted, or return an error. Enabled by amq -uu
|
||||
|
||||
2009-01-11 Erez Zadok <ezk@fsl.cs.sunysb.edu>
|
||||
|
||||
* amd/ops_udf.c: don't define functions/variables which may not be
|
||||
used.
|
||||
|
||||
* amd/ops_tmpfs.c (mount_tmpfs): force gcc not to complain about
|
||||
unused variables.
|
||||
|
||||
* config.guess.long: properly support Fedora Core.
|
||||
|
||||
2009-01-09 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Fix nfs mounts on linux 2.6.26 by explicitly initializing context.
|
||||
|
||||
* Treat an empty sublink as an unset sublink; this allows us to
|
||||
say sublink:=; in a spec to override the default. (This produces
|
||||
Bad selector error, but it works. XXX: We need to decide how to
|
||||
unset a selector. I proposed an unset keyword a while ago).
|
||||
|
||||
2009-01-06 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* re-renerate all generated files with newer versions of the
|
||||
auto-tools.
|
||||
|
||||
* move INSTALL to INSTALL.am-utils to avoid conflicts
|
||||
|
||||
* fix incompatibilities with new m4 and new autoconf.
|
||||
|
||||
* add UDF filesystem support.
|
||||
|
||||
* fix NetBSD nfs file handle detection.
|
||||
|
||||
2009-01-02 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* add nocasetrans, nojoliet, rrcaseins for cd9660 filesystems
|
||||
|
||||
2008-12-03 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* allow ldap queries try a comma-separated list of servers given as:
|
||||
|
||||
ldap_hostports = host1:port1,host2,host3:port3
|
||||
|
||||
original patch from Florian Geyer
|
||||
|
||||
2008-09-19 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* the auth_create gid on NetBSD is int
|
||||
|
||||
* deal with lossage from flex -P
|
||||
|
||||
* fix missing/incorrect prototypes
|
||||
|
||||
>>>>>>> 1.1.1.2
|
||||
2008-09-17 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* fix manual page section issues (sorting, non-existant)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" $NetBSD: amd.8,v 1.2 2008/09/19 21:46:14 christos Exp $
|
||||
.\" $NetBSD: amd.8,v 1.3 2009/03/20 20:30:52 christos Exp $
|
||||
.\"
|
||||
.\"
|
||||
.\" Copyright (c) 1997-2007 Erez Zadok
|
||||
.\" Copyright (c) 1997-2009 Erez Zadok
|
||||
.\" Copyright (c) 1989 Jan-Simon Pendry
|
||||
.\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
|
||||
.\" Copyright (c) 1989 The Regents of the University of California.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* $NetBSD: conf_tok.l,v 1.2 2008/09/19 21:38:41 christos Exp $ */
|
||||
/* $NetBSD: conf_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
|
||||
|
||||
%{
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 1989 Jan-Simon Pendry
|
||||
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
|
||||
* Copyright (c) 1989 The Regents of the University of California.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: ops_cdfs.c,v 1.2 2009/01/02 16:00:02 christos Exp $ */
|
||||
/* $NetBSD: ops_cdfs.c,v 1.3 2009/03/20 20:30:52 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 1990 Jan-Simon Pendry
|
||||
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* $NetBSD: sun_map_parse.y,v 1.2 2008/09/19 21:38:41 christos Exp $ */
|
||||
/* $NetBSD: sun_map_parse.y,v 1.3 2009/03/20 20:30:52 christos Exp $ */
|
||||
|
||||
%{
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 2005 Daniel P. Ottavio
|
||||
* Copyright (c) 1990 Jan-Simon Pendry
|
||||
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* $NetBSD: sun_map_tok.l,v 1.2 2008/09/19 21:38:41 christos Exp $ */
|
||||
/* $NetBSD: sun_map_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
|
||||
|
||||
%{
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 2005 Daniel P. Ottavio
|
||||
* Copyright (c) 1990 Jan-Simon Pendry
|
||||
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# $NetBSD: amd2netbsd,v 1.1 2008/09/19 21:38:41 christos Exp $
|
||||
# $NetBSD: amd2netbsd,v 1.2 2009/03/20 20:30:52 christos Exp $
|
||||
#
|
||||
# Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
|
|
@ -34,9 +34,9 @@
|
|||
#
|
||||
# $ cd /some/where/temporary
|
||||
# $ tar xpfz /new/amd/release/tar/file
|
||||
# $ sh /usr/src/dist/am-utils/amd2netbsd am-utils-6.x.y `pwd`
|
||||
# $ sh /usr/src/external/bsd/am-utils/dist/amd2netbsd am-utils-6.x.y `pwd`
|
||||
# $ cd src/dist/am-utils
|
||||
# $ cvs import -m "Import am-utils 6.x.y" src/dist/am-utils ezk am-utils-6-x-y
|
||||
# $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import am-utils 6.x.y" src/external/bsd/am-utils/dist ezk am-utils-6-x-y
|
||||
# $ cd ../../../am-utils-6.x.y
|
||||
# $ run ./configure
|
||||
# merge newly generated config.h with /usr/src/usr.sbin/amd/include/config.h
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" $NetBSD: amq.8,v 1.2 2008/09/19 21:46:58 christos Exp $
|
||||
.\" $NetBSD: amq.8,v 1.3 2009/03/20 20:30:52 christos Exp $
|
||||
.\"
|
||||
.\"
|
||||
.\" Copyright (c) 1997-2007 Erez Zadok
|
||||
.\" Copyright (c) 1997-2009 Erez Zadok
|
||||
.\" Copyright (c) 1990 Jan-Simon Pendry
|
||||
.\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
|
||||
.\" Copyright (c) 1990 The Regents of the University of California.
|
||||
|
|
@ -47,7 +47,7 @@ amq \- automounter query tool
|
|||
.SH SYNOPSIS
|
||||
.B amq
|
||||
[
|
||||
.BI \-fmpsvwHTU
|
||||
.BI \-fmpqsvwHTU
|
||||
] [
|
||||
.BI \-h " hostname"
|
||||
] [
|
||||
|
|
@ -117,6 +117,13 @@ search through the process table. This option is used in the
|
|||
.I ctl-amd
|
||||
script.
|
||||
|
||||
.TP
|
||||
.B \-q
|
||||
Suppress error messages produced when attempting synchronous unmounts
|
||||
with the
|
||||
.B \-u
|
||||
option.
|
||||
|
||||
.TP
|
||||
.B \-s
|
||||
Ask the automounter to provide system-wide mount statistics.
|
||||
|
|
@ -130,6 +137,16 @@ information about them. Unmounts are requested, not forced. They merely
|
|||
cause the mounted filesystem to timeout, which will be picked up by
|
||||
.BR amd 's
|
||||
main scheduler thus causing the normal timeout action to be taken.
|
||||
If the
|
||||
.B \-u
|
||||
option is repeated,
|
||||
.B amq
|
||||
will attempt to unmount the file system synchronously by waiting until
|
||||
the timeout action is taken and returning an error if the unmount
|
||||
fails.
|
||||
Any error messages produced may be suppressed with the
|
||||
.B \-q
|
||||
option.
|
||||
|
||||
.TP
|
||||
.B \-v
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ AH_BOTTOM([
|
|||
dnl
|
||||
dnl AC_CONFIG_AUX_DIR(m4)
|
||||
AC_PREREQ(2.52)
|
||||
AC_REVISION($Revision: 1.2 $)
|
||||
AC_COPYRIGHT([Copyright (c) 1997-2007 Erez Zadok])
|
||||
AC_REVISION(Revision: 1.2)
|
||||
AC_COPYRIGHT([Copyright (c) 1997-2009 Erez Zadok])
|
||||
dnl find out system type
|
||||
AC_MSG_NOTICE(*** SYSTEM TYPES ***)
|
||||
dnl run by libtool, but must be kept here because HOST_MACROS depends on it
|
||||
|
|
@ -433,6 +433,7 @@ AC_CHECK_HEADERS( \
|
|||
bsd/rpc/rpc.h \
|
||||
cdfs/cdfsmount.h \
|
||||
cdfs/cdfs_mount.h \
|
||||
fs/udf/udf_mount.h \
|
||||
db1/ndbm.h \
|
||||
fs/efs/efs_mount.h \
|
||||
fs/msdosfs/msdosfsmount.h \
|
||||
|
|
@ -624,6 +625,9 @@ AC_CHECK_HEADERS([ \
|
|||
#ifdef HAVE_RPC_RPC_H
|
||||
# include <rpc/rpc.h>
|
||||
#endif /* HAVE_RPC_RPC_H */
|
||||
#ifdef HAVE_NFS_RPCV2_H
|
||||
# include <nfs/rpcv2.h>
|
||||
#endif /* HAVE_NFS_RPCV2_H */
|
||||
])
|
||||
AC_CHECK_HEADERS([ \
|
||||
linux/auto_fs.h \
|
||||
|
|
@ -769,6 +773,7 @@ fi
|
|||
dnl -----------------------------------------------------------------------
|
||||
AMU_STRUCT_FIELD_NFS_FH
|
||||
AMU_STRUCT_NFS_FH
|
||||
AMU_STRUCT_NFS_FH3
|
||||
AMU_CHECK_FS_MNTENT(nfs3)
|
||||
dnl ======================================================================
|
||||
|
||||
|
|
@ -807,6 +812,7 @@ AMU_TYPE_SVC_IN_ARG
|
|||
AMU_TYPE_AUTOFS_ARGS
|
||||
AMU_TYPE_CACHEFS_ARGS
|
||||
AMU_TYPE_CDFS_ARGS
|
||||
AMU_TYPE_UDF_ARGS
|
||||
AMU_TYPE_LOFS_ARGS
|
||||
AMU_TYPE_MFS_ARGS
|
||||
AMU_TYPE_PCFS_ARGS
|
||||
|
|
@ -910,6 +916,16 @@ AMU_CHECK_FIELD(cdfs_args_t.iso_flags)
|
|||
AMU_CHECK_FIELD(cdfs_args_t.iso_pgthresh)
|
||||
AMU_CHECK_FIELD(cdfs_args_t.norrip)
|
||||
AMU_CHECK_FIELD(cdfs_args_t.ssector)
|
||||
AMU_CHECK_FIELD(udf_args_t.version)
|
||||
AMU_CHECK_FIELD(udf_args_t.fspec)
|
||||
AMU_CHECK_FIELD(udf_args_t.sessionnr)
|
||||
AMU_CHECK_FIELD(udf_args_t.udfmflags)
|
||||
AMU_CHECK_FIELD(udf_args_t.gmtoff)
|
||||
AMU_CHECK_FIELD(udf_args_t.anon_uid)
|
||||
AMU_CHECK_FIELD(udf_args_t.anon_gid)
|
||||
AMU_CHECK_FIELD(udf_args_t.nobody_uid)
|
||||
AMU_CHECK_FIELD(udf_args_t.nobody_gid)
|
||||
AMU_CHECK_FIELD(udf_args_t.sector_size)
|
||||
AMU_CHECK_FIELD(pcfs_args_t.dirmask)
|
||||
AMU_CHECK_FIELD(pcfs_args_t.dsttime)
|
||||
AMU_CHECK_FIELD(pcfs_args_t.fspec)
|
||||
|
|
@ -949,6 +965,8 @@ AMU_CHECK_FIELD(nfs_args_t.pathconf)
|
|||
AMU_CHECK_FIELD(nfs_args_t.proto)
|
||||
AMU_CHECK_FIELD(nfs_args_t.sotype)
|
||||
AMU_CHECK_FIELD(nfs_args_t.version)
|
||||
AMU_CHECK_FIELD(nfs_args_t.pseudoflavor)
|
||||
AMU_CHECK_FIELD(nfs_args_t.context)
|
||||
AMU_CHECK_FIELD(struct ifreq.ifr_addr)
|
||||
AMU_CHECK_FIELD(struct ifaddrs.ifa_next)
|
||||
AMU_CHECK_FIELD(struct sockaddr.sa_len)
|
||||
|
|
@ -999,6 +1017,7 @@ dnl check for filesystem existence if MNTTYPE_<filesystem> exists, then if
|
|||
dnl MOUNT_<fs>, then MNT_<fs>, then in /proc/filesystems, and getvfsbyname()
|
||||
AMU_CHECK_FS_MNTENT(autofs)
|
||||
AMU_CHECK_FS_MNTENT(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs)
|
||||
AMU_CHECK_FS_MNTENT(udf)
|
||||
AMU_CHECK_FS_MNTENT(cache)
|
||||
AMU_CHECK_FS_MNTENT(lofs lo, lofs)
|
||||
AMU_CHECK_FS_MNTENT(mfs)
|
||||
|
|
@ -1025,6 +1044,7 @@ AMU_CHECK_FS_MNTENT(umap umapfs, umapfs)
|
|||
dnl check for filesystem existence if their headers exist
|
||||
dnl AMU_CHECK_FS_HEADERS(cfs.h, cfs)
|
||||
AMU_CHECK_FS_HEADERS(hsfs/hsfs.h, cdfs)
|
||||
AMU_CHECK_FS_HEADERS(fs/udf/udf_mount.h, udf)
|
||||
AMU_CHECK_FS_HEADERS(tmpfs/tmp.h, tmpfs)
|
||||
AMU_CHECK_FS_HEADERS(fs/tmpfs/tmpfs_args.h, tmpfs)
|
||||
AMU_CHECK_FS_HEADERS(fs/efs/efs_mount.h, efs)
|
||||
|
|
@ -1063,6 +1083,7 @@ AMU_CHECK_MOUNT_TYPE(ext3 ext2 ffs ufs 4.2 4.3 4.4 efs xfs jfs ultrix, ufs)
|
|||
AMU_CHECK_MOUNT_TYPE(xfs)
|
||||
AMU_CHECK_MOUNT_TYPE(efs)
|
||||
AMU_CHECK_MOUNT_TYPE(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs)
|
||||
AMU_CHECK_MOUNT_TYPE(udf)
|
||||
AMU_CHECK_MOUNT_TYPE(vfat pcfs pc msdos msdosfs fat, pcfs)
|
||||
AMU_CHECK_MOUNT_TYPE(mfs)
|
||||
AMU_CHECK_MOUNT_TYPE(tmpfs tmp, tmpfs)
|
||||
|
|
@ -1086,6 +1107,7 @@ AMU_CHECK_MNTTAB_TYPE(ext3 ext2 ffs ufs 4.2 4.3 4.4 efs xfs jfs ultrix, ufs)
|
|||
AMU_CHECK_MNTTAB_TYPE(xfs)
|
||||
AMU_CHECK_MNTTAB_TYPE(efs)
|
||||
AMU_CHECK_MNTTAB_TYPE(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs)
|
||||
AMU_CHECK_MNTTAB_TYPE(udf)
|
||||
AMU_CHECK_MNTTAB_TYPE(vfat pcfs pc msdos msdosfs fat, pcfs)
|
||||
AMU_CHECK_MNTTAB_TYPE(mfs)
|
||||
AMU_CHECK_MNTTAB_TYPE(tmpfs tmp, tmpfs)
|
||||
|
|
@ -1273,6 +1295,15 @@ AMU_CHECK_MNT2_CDFS_OPTS(\
|
|||
)
|
||||
dnl ======================================================================
|
||||
|
||||
dnl ######################################################################
|
||||
dnl UDF-specific mount(2) options (hex numbers) like M_*
|
||||
AC_MSG_NOTICE(*** UDF-SPECIFIC MOUNT(2) OPTIONS ***)
|
||||
dnl if found, defines MNT2_UDF_OPT_*
|
||||
AMU_CHECK_MNT2_UDF_OPTS(\
|
||||
closesession \
|
||||
)
|
||||
dnl ======================================================================
|
||||
|
||||
dnl ######################################################################
|
||||
dnl PCFS-specific mount(2) options (hex numbers) like M_*
|
||||
AC_MSG_NOTICE(*** PCFS-SPECIFIC MOUNT(2) OPTIONS ***)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
\input texinfo @c -*-texinfo-*-
|
||||
@c $NetBSD: am-utils.texi,v 1.2 2009/01/02 16:00:02 christos Exp $
|
||||
@c $NetBSD: am-utils.texi,v 1.3 2009/03/20 20:30:52 christos Exp $
|
||||
@c
|
||||
@c Copyright (c) 1997-2007 Erez Zadok
|
||||
@c Copyright (c) 1997-2009 Erez Zadok
|
||||
@c Copyright (c) 1989 Jan-Simon Pendry
|
||||
@c Copyright (c) 1989 Imperial College of Science, Technology & Medicine
|
||||
@c Copyright (c) 1989 The Regents of the University of California.
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
(Originally by Jan-Simon Pendry and Nick Williams)
|
||||
|
||||
@page
|
||||
Copyright @copyright{} 1997-2007 Erez Zadok
|
||||
Copyright @copyright{} 1997-2009 Erez Zadok
|
||||
@*
|
||||
Copyright @copyright{} 1989 Jan-Simon Pendry
|
||||
@*
|
||||
|
|
@ -94,7 +94,7 @@ For version @value{VERSION}, @value{UPDATED}
|
|||
@*
|
||||
(Originally by Jan-Simon Pendry and Nick Williams)
|
||||
|
||||
Copyright @copyright{} 1997-2007 Erez Zadok
|
||||
Copyright @copyright{} 1997-2009 Erez Zadok
|
||||
@*
|
||||
Copyright @copyright{} 1989 Jan-Simon Pendry
|
||||
@*
|
||||
|
|
@ -2100,6 +2100,10 @@ Ignore this mount by @b{df}(1).
|
|||
@cindex Mount flags; cache
|
||||
Allow data to be cached from a remote server for this mount.
|
||||
|
||||
@item closesession
|
||||
@cindex Mount flags; closesession
|
||||
For UDF mounts, close the session when unmounting.
|
||||
|
||||
@item compress
|
||||
@cindex Mount flags; compress
|
||||
Use NFS compression protocol.
|
||||
|
|
@ -2139,10 +2143,16 @@ Set ID of filesystem.
|
|||
Enable generations in ISO-9660 file systems. Generations allow you to
|
||||
see all versions of a given file.
|
||||
|
||||
@item gmtoff=@var{n}
|
||||
@cindex Mount flags; gmtoff
|
||||
For UDF mounts, set the time zone offset from UTC to @var{n} seconds,
|
||||
with positive values indicating east of the Prime Meridian. If not
|
||||
set, the user's current time zone will be used.
|
||||
|
||||
@item group=@var{n}
|
||||
@cindex Mount flags; group
|
||||
For PCFS mounts, set the group of the files in the file system to
|
||||
@var{n} (which can either be a group name or a GID number). The
|
||||
For PCFS and UDF mounts, set the group of the files in the file system
|
||||
to @var{n} (which can either be a group name or a GID number). The
|
||||
default group is the group of the directory on which the file system
|
||||
is being mounted.
|
||||
|
||||
|
|
@ -2349,6 +2359,10 @@ NFS/UDP through a gateway or a slow link.
|
|||
@cindex Mount flags; rw
|
||||
Allow reads and writes on this filesystem.
|
||||
|
||||
@item sessionnr=@var{n}
|
||||
@cindex Mount Flags; sessionnr
|
||||
For multisession UDF mounts, use session number @var{n} when mounting.
|
||||
|
||||
@item shortname
|
||||
@cindex Mount Flags; longname
|
||||
For PCFS mounts, force old DOS short names only.
|
||||
|
|
@ -2384,8 +2398,8 @@ The NFS timeout, in tenth-seconds, before a request is retransmitted.
|
|||
|
||||
@item user=@var{n}
|
||||
@cindex Mount flags; user
|
||||
For PCFS mounts, set the owner of the files in the file system to
|
||||
@var{n} (which can either be a user name or a UID number). The
|
||||
For PCFS and UDF mounts, set the owner of the files in the file system
|
||||
to @var{n} (which can either be a user name or a UID number). The
|
||||
default owner is the owner of the directory on which the file system
|
||||
is being mounted.
|
||||
|
||||
|
|
@ -2846,7 +2860,7 @@ full_os=solaris2.5.1, os=sos5, osver=5.5.1, vendor=sun.
|
|||
Map support for: root, passwd, union, nisplus, nis, ndbm, file, error.
|
||||
AMFS: nfs, link, nfsx, nfsl, host, linkx, program, union, inherit,
|
||||
ufs, lofs, hsfs, pcfs, auto, direct, toplvl, error.
|
||||
FS: autofs, cachefs, cdfs, lofs, nfs, nfs3, pcfs, tfs, tmpfs, ufs.
|
||||
FS: autofs, cachefs, cdfs, lofs, nfs, nfs3, pcfs, tfs, tmpfs, udf, ufs.
|
||||
Network 1: wire="mcl-lab-net.cs.columbia.edu" (netnumber=128.59.13).
|
||||
Network 2: wire="14-net.cs.columbia.edu" (netnumber=128.59.14).
|
||||
Network 3: wire="old-net.cs.columbia.edu" (netnumber=128.59.16).
|
||||
|
|
@ -3172,6 +3186,7 @@ effect visible to the user.@refill
|
|||
* Unix Filesystem:: Native disk filesystem.
|
||||
* Caching Filesystem:: Caching from remote server filesystem.
|
||||
* CD-ROM Filesystem:: ISO9660 CD ROM.
|
||||
* UDF Filesystem:: Universal Disk Format filesystem.
|
||||
* Loopback Filesystem:: Local loopback-mount filesystem.
|
||||
* Memory/RAM Filesystem:: A memory or RAM-based filesystem.
|
||||
* Null Filesystem:: 4.4BSD's loopback-mount filesystem.
|
||||
|
|
@ -3497,7 +3512,7 @@ inconsistent, requiring running the command @file{fsck -F cachefs
|
|||
@end enumerate
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node CD-ROM Filesystem, Loopback Filesystem, Caching Filesystem, Filesystem Types
|
||||
@node CD-ROM Filesystem, UDF Filesystem, Caching Filesystem, Filesystem Types
|
||||
@comment node-name, next, previous, up
|
||||
@section CD-ROM Filesystem (@samp{cdfs})
|
||||
@cindex CD-ROM Filesystem
|
||||
|
|
@ -3526,7 +3541,36 @@ cdfs os==sunos4;type:=cdfs;dev:=/dev/sr0 \
|
|||
@end example
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node Loopback Filesystem, Memory/RAM Filesystem, CD-ROM Filesystem, Filesystem Types
|
||||
@node UDF Filesystem, Loopback Filesystem, CD-ROM Filesystem, Filesystem Types
|
||||
@comment node-name, next, previous, up
|
||||
@section CD-ROM Filesystem (@samp{udf})
|
||||
@cindex CD-ROM Filesystem
|
||||
@cindex udf, filesystem type
|
||||
@cindex Filesystem type; udf
|
||||
|
||||
The @dfn{udf} (@samp{type:=udf}) filesystem mounts media with a
|
||||
Universal Disk Format (UDF) filesystem on it, e.g., a video DVD.
|
||||
|
||||
@noindent
|
||||
The following option must be specified:
|
||||
|
||||
@table @code
|
||||
@cindex dev, mount option
|
||||
@cindex Mount option; dev
|
||||
@item dev
|
||||
the block special device to be mounted.
|
||||
@end table
|
||||
|
||||
Some operating systems will fail to mount read-only media unless the
|
||||
@samp{ro} option is specified. A udf entry might be:
|
||||
|
||||
@example
|
||||
udf os==sunos4;type:=udf;dev:=/dev/sr0 \
|
||||
os==sunos5;addopts:=ro;type:=udf;dev:=/dev/dsk/c0t6d0s2
|
||||
@end example
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node Loopback Filesystem, Memory/RAM Filesystem, UDF Filesystem, Filesystem Types
|
||||
@comment node-name, next, previous, up
|
||||
@section Loopback Filesystem (@samp{lofs})
|
||||
@cindex Loopback Filesystem
|
||||
|
|
@ -5470,6 +5514,7 @@ mount point.
|
|||
* Amq -m option:: Obtaining mount statistics.
|
||||
* Amq -p option:: Getting Amd's process ID.
|
||||
* Amq -P option:: Contacting alternate Amd processes.
|
||||
* Amq -q option:: Suppress synchronous unmounting errors.
|
||||
* Amq -s option:: Obtaining global statistics.
|
||||
* Amq -T option:: Use TCP transport.
|
||||
* Amq -U option:: Use UDP transport.
|
||||
|
|
@ -5675,7 +5720,7 @@ rather not have to search through the process table. This option is
|
|||
used in the @file{ctl-amd} script.
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node Amq -P option, Amq -s option, Amq -p option, Controlling Amd
|
||||
@node Amq -P option, Amq -q option, Amq -p option, Controlling Amd
|
||||
@comment node-name, next, previous, up
|
||||
@subsection @i{Amq} @code{-P} option
|
||||
@cindex Multiple Amd processes
|
||||
|
|
@ -5698,7 +5743,16 @@ kill `amq -p -P 300020`
|
|||
@end example
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node Amq -s option, Amq -T option, Amq -P option, Controlling Amd
|
||||
@node Amq -q option, Amq -s option, Amq -P option, Controlling Amd
|
||||
@comment node-name, next, previous, up
|
||||
@subsection @i{Amq} @code{-q} option
|
||||
@cindex Unmounting a filesystem
|
||||
|
||||
Suppress any error messages produced when a synchronous unmount fails.
|
||||
See @ref{Amq -u option}.
|
||||
|
||||
@c ----------------------------------------------------------------
|
||||
@node Amq -s option, Amq -T option, Amq -q option, Controlling Amd
|
||||
@comment node-name, next, previous, up
|
||||
@subsection @i{Amq} @code{-s} option
|
||||
@cindex Global statistics
|
||||
|
|
@ -5763,11 +5817,19 @@ and if that failed, will try UDP.
|
|||
@cindex Forcing filesystem to time out
|
||||
@cindex Unmounting a filesystem
|
||||
|
||||
The @code{-u} option causes the time-to-live interval of the named mount
|
||||
points to be expired, thus causing an unmount attempt. This is the only
|
||||
safe way to unmount an automounted filesystem. It is not possible to
|
||||
unmount a filesystem which has been mounted with the @samp{nounmount}
|
||||
flag.
|
||||
The @code{-u} option causes the time-to-live interval of the named
|
||||
mount points to be expired, thus causing an unmount attempt. This is
|
||||
the only safe way to unmount an automounted filesystem. If @code{-u}
|
||||
is repeated, then @i{Amd} will attempt to unmount the filesystem
|
||||
synchronously. This makes things like
|
||||
|
||||
@example
|
||||
amq -uu /t/cd0d && eject cd0
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
work as expected. Any error messages this might produce can be
|
||||
suppressed with the @code{-q} option. See @ref{Amq -q option}.
|
||||
|
||||
@c The @code{-H} option informs @i{Amd} that the specified mount point
|
||||
@c has hung - as if its keepalive timer had expired.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* $NetBSD: fsi_lex.l,v 1.2 2008/09/19 21:38:41 christos Exp $ */
|
||||
/* $NetBSD: fsi_lex.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
|
||||
|
||||
%{
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 1989 Jan-Simon Pendry
|
||||
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
|
||||
* Copyright (c) 1989 The Regents of the University of California.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" $NetBSD: hlfsd.8,v 1.2 2008/09/19 21:49:09 christos Exp $
|
||||
.\" $NetBSD: hlfsd.8,v 1.3 2009/03/20 20:30:53 christos Exp $
|
||||
.\"
|
||||
.\"
|
||||
.\" Copyright (c) 1997-2007 Erez Zadok
|
||||
.\" Copyright (c) 1997-2009 Erez Zadok
|
||||
.\" Copyright (c) 1989 Jan-Simon Pendry
|
||||
.\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
|
||||
.\" Copyright (c) 1989 The Regents of the University of California.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: am_compat.h,v 1.2 2009/01/02 16:00:02 christos Exp $ */
|
||||
/* $NetBSD: am_compat.h,v 1.3 2009/03/20 20:30:53 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997-2007 Erez Zadok
|
||||
* Copyright (c) 1997-2009 Erez Zadok
|
||||
* Copyright (c) 1990 Jan-Simon Pendry
|
||||
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
|
|
@ -195,6 +195,12 @@
|
|||
# define MNTTAB_OPT_RRCASEINS "rrcaseins"
|
||||
#endif /* defined(MNT2_CDFS_OPT_RRCASEINS) && !defined(MNTTAB_OPT_RRCASEINS) */
|
||||
|
||||
/*
|
||||
* Complete MNTTAB_OPT_* options based on MNT2_UDF_OPT_* mount options.
|
||||
*/
|
||||
#if defined(MNT2_UDF_OPT_CLOSESESSION) && !defined(MNTTAB_OPT_CLOSESESSION)
|
||||
# define MNTTAB_OPT_CLOSESESSION "closesession"
|
||||
#endif /* defined(MNT2_UDF_OPT_CLOSESESSION) && !defined(MNTTAB_OPT_CLOSESESSION) */
|
||||
|
||||
/*
|
||||
* Complete MNTTAB_OPT_* options based on MNT2_PCFS_OPT_* mount options.
|
||||
|
|
@ -337,6 +343,20 @@
|
|||
# define MNTTAB_OPT_DIRMASK "dirmask"
|
||||
#endif /* not MNTTAB_OPT_DIRMASK */
|
||||
|
||||
/* useful for udf mounts */
|
||||
#ifndef MNTTAB_OPT_USER
|
||||
# define MNTTAB_OPT_USER "user"
|
||||
#endif /* not MNTTAB_OPT_USER */
|
||||
#ifndef MNTTAB_OPT_GROUP
|
||||
# define MNTTAB_OPT_GROUP "group"
|
||||
#endif /* not MNTTAB_OPT_GROUP */
|
||||
#ifndef MNTTAB_OPT_GMTOFF
|
||||
# define MNTTAB_OPT_GMTOFF "gmtoff"
|
||||
#endif /* not MNTTAB_OPT_GMTOFF */
|
||||
#ifndef MNTTAB_OPT_SESSIONNR
|
||||
# define MNTTAB_OPT_SESSIONNR "sessionnr"
|
||||
#endif /* not MNTTAB_OPT_SESSIONNR */
|
||||
|
||||
/*
|
||||
* Incomplete filesystem definitions (sunos4, irix6, solaris2)
|
||||
*/
|
||||
|
|
@ -373,6 +393,13 @@ struct hsfs_args {
|
|||
# define ufs_args_t u_int
|
||||
#endif /* defined(HAVE_FS_UFS) && !defined(ufs_args_t) */
|
||||
|
||||
/*
|
||||
* if does not define struct udf_args, assume integer bit-field (linux)
|
||||
*/
|
||||
#if defined(HAVE_FS_UDF) && !defined(udf_args_t)
|
||||
# define udf_args_t u_int
|
||||
#endif /* defined(HAVE_FS_UDF) && !defined(udf_args_t) */
|
||||
|
||||
/*
|
||||
* if does not define struct efs_args, assume integer bit-field (linux)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -97,6 +97,9 @@ AH_TEMPLATE([HAVE_FS_HSFS],
|
|||
AH_TEMPLATE([HAVE_FS_CDFS],
|
||||
[Define if have CDFS filesystem])
|
||||
|
||||
AH_TEMPLATE([HAVE_FS_UDF],
|
||||
[Define if have UDF filesystem])
|
||||
|
||||
AH_TEMPLATE([HAVE_FS_TFS],
|
||||
[Define if have TFS filesystem])
|
||||
|
||||
|
|
@ -151,6 +154,9 @@ AH_TEMPLATE([MOUNT_TYPE_LOFS],
|
|||
AH_TEMPLATE([MOUNT_TYPE_CDFS],
|
||||
[Mount(2) type/name for CDFS filesystem])
|
||||
|
||||
AH_TEMPLATE([MOUNT_TYPE_UDF],
|
||||
[Mount(2) type/name for UDF filesystem])
|
||||
|
||||
AH_TEMPLATE([MOUNT_TYPE_TFS],
|
||||
[Mount(2) type/name for TFS filesystem])
|
||||
|
||||
|
|
@ -208,6 +214,9 @@ AH_TEMPLATE([MNTTAB_TYPE_LOFS],
|
|||
AH_TEMPLATE([MNTTAB_TYPE_CDFS],
|
||||
[Mount-table entry name for CDFS filesystem])
|
||||
|
||||
AH_TEMPLATE([MNTTAB_TYPE_UDF],
|
||||
[Mount-table entry name for UDF filesystem])
|
||||
|
||||
AH_TEMPLATE([MNTTAB_TYPE_TFS],
|
||||
[Mount-table entry name for TFS filesystem])
|
||||
|
||||
|
|
@ -728,6 +737,9 @@ AH_TEMPLATE([MNT2_CDFS_OPT_RRCASEINS],
|
|||
AH_TEMPLATE([MNT2_CDFS_OPT_RRIP],
|
||||
[Use Rock Ridge Interchange Protocol (RRIP) extensions])
|
||||
|
||||
AH_TEMPLATE([MNT2_UDF_OPT_CLOSESESSION],
|
||||
[Close session when unmounting])
|
||||
|
||||
AH_TEMPLATE([MNT2_PCFS_OPT_LONGNAME],
|
||||
[Force Win95 long names])
|
||||
|
||||
|
|
@ -884,6 +896,9 @@ AH_TEMPLATE([lofs_args_t],
|
|||
AH_TEMPLATE([cdfs_args_t],
|
||||
[Define a type for the cdfs_args structure])
|
||||
|
||||
AH_TEMPLATE([udf_args_t],
|
||||
[Define a type for the udf_args structure])
|
||||
|
||||
AH_TEMPLATE([mfs_args_t],
|
||||
[Define a type for the mfs_args structure])
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue