add missing options from the cd9660 filesystem.

This commit is contained in:
christos 2009-01-02 16:00:02 +00:00
parent b55ef665bd
commit 544d676ec2
5 changed files with 56 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2009-01-02 Christos Zoulas <christos@zoulas.com>
* add nocasetrans, nojoliet, rrcaseins for cd9660 filesystems
2008-09-17 Christos Zoulas <christos@zoulas.com>
* fix manual page section issues (sorting, non-existant)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ops_cdfs.c,v 1.1.1.1 2008/09/19 20:07:16 christos Exp $ */
/* $NetBSD: ops_cdfs.c,v 1.2 2009/01/02 16:00:02 christos Exp $ */
/*
* Copyright (c) 1997-2007 Erez Zadok
@ -150,6 +150,7 @@ mount_cdfs(char *mntdir, char *fs_name, char *opts, int on_autofs)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_RRIP))
cdfs_flags |= MNT2_CDFS_OPT_RRIP;
#endif /* defined(MNT2_CDFS_OPT_RRIP) && defined(MNTTAB_OPT_RRIP) */
#if defined(MNT2_CDFS_OPT_NORRIP) && defined(MNTTAB_OPT_NORRIP)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_NORRIP))
cdfs_flags |= MNT2_CDFS_OPT_NORRIP;
@ -159,11 +160,27 @@ mount_cdfs(char *mntdir, char *fs_name, char *opts, int on_autofs)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_GENS))
cdfs_flags |= MNT2_CDFS_OPT_GENS;
#endif /* defined(MNT2_CDFS_OPT_GENS) && defined(MNTTAB_OPT_GENS) */
#if defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_EXTATT))
cdfs_flags |= MNT2_CDFS_OPT_EXTATT;
#endif /* defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT) */
#if defined(MNT2_CDFS_OPT_NOCASETRANS) && defined(MNTTAB_OPT_NOCASETRANS)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_NOCASETRANS))
cdfs_flags |= MNT2_CDFS_OPT_NOCASETRANS;
#endif /* defined(MNT2_CDFS_OPT_NOCASETRANS) && defined(MNTTAB_OPT_NOCASETRANS) */
#if defined(MNT2_CDFS_OPT_NOJOLIET) && defined(MNTTAB_OPT_NOJOLIET)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_NOJOLIET))
cdfs_flags |= MNT2_CDFS_OPT_NOJOLIET;
#endif /* defined(MNT2_CDFS_OPT_NOJOLIET) && defined(MNTTAB_OPT_NOJOLIET) */
#if defined(MNT2_CDFS_OPT_RRCASEINS) && defined(MNTTAB_OPT_RRCASEINS)
if (amu_hasmntopt(&mnt, MNTTAB_OPT_RRCASEINS))
cdfs_flags |= MNT2_CDFS_OPT_RRCASEINS;
#endif /* defined(MNT2_CDFS_OPT_RRCASEINS) && defined(MNTTAB_OPT_RRCASEINS) */
genflags = compute_mount_flags(&mnt);
#ifdef HAVE_FS_AUTOFS
if (on_autofs)

View File

@ -55,7 +55,7 @@ AH_BOTTOM([
dnl
dnl AC_CONFIG_AUX_DIR(m4)
AC_PREREQ(2.52)
AC_REVISION($Revision: 1.1.1.1 $)
AC_REVISION($Revision: 1.2 $)
AC_COPYRIGHT([Copyright (c) 1997-2007 Erez Zadok])
dnl find out system type
AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@ -1263,9 +1263,12 @@ AMU_CHECK_MNT2_CDFS_OPTS(\
defperm \
extatt \
gens \
nocasetrans \
nodefperm \
nojoliet \
norrip \
noversion \
rrcaseins \
rrip \
)
dnl ======================================================================

View File

@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@c $NetBSD: am-utils.texi,v 1.1.1.1 2008/09/19 20:07:20 christos Exp $
@c $NetBSD: am-utils.texi,v 1.2 2009/01/02 16:00:02 christos Exp $
@c
@c Copyright (c) 1997-2007 Erez Zadok
@c Copyright (c) 1989 Jan-Simon Pendry
@ -2201,6 +2201,11 @@ is used.
Do not allow data to be cached from a remote server for this
mount.
@item nocasetrans
@cindex Mount flags; nocasetrans
Don't do case translation. Useful for CD-ROMS formatted as
ISO-9660.
@item noconn
@cindex Mount flags; noconn
Don't make a connection on datagram transports.
@ -2228,6 +2233,10 @@ Don't allow program execution.
@cindex Mount flags; noint
Do not allow keyboard interrupts for this mount
@item nojoliet
@cindex Mount flags; nojoliet
Turn off the Joliet extensions. Useful for CD-ROMS formatted as ISO-9660.
@item nolock
@cindex Mount flags; nolock
Do not use the NFS locking protocol
@ -2322,6 +2331,11 @@ trying}.
@cindex Mount flags; retry
Set the NFS retry counter.
@item rrcaseins
@cindex Mount flags; rrcaseins
Enable the Rock Ridge Interchange Protocol (RRIP) case insensitive extensions.
Useful for CD-ROMS formatted as ISO-9660.
@item rrip
@cindex Mount flags; rrip
Uses the Rock Ridge Interchange Protocol (RRIP) extensions to ISO-9660.

View File

@ -1,4 +1,4 @@
/* $NetBSD: am_compat.h,v 1.1.1.1 2008/09/19 20:07:21 christos Exp $ */
/* $NetBSD: am_compat.h,v 1.2 2009/01/02 16:00:02 christos Exp $ */
/*
* Copyright (c) 1997-2007 Erez Zadok
@ -178,10 +178,24 @@
#if defined(MNT2_CDFS_OPT_GENS) && !defined(MNTTAB_OPT_GENS)
# define MNTTAB_OPT_GENS "gens"
#endif /* defined(MNT2_CDFS_OPT_GENS) && !defined(MNTTAB_OPT_GENS) */
#if defined(MNT2_CDFS_OPT_EXTATT) && !defined(MNTTAB_OPT_EXTATT)
# define MNTTAB_OPT_EXTATT "extatt"
#endif /* defined(MNT2_CDFS_OPT_EXTATT) && !defined(MNTTAB_OPT_EXTATT) */
#if defined(MNT2_CDFS_OPT_NOJOLIET) && !defined(MNTTAB_OPT_NOJOLIET)
# define MNTTAB_OPT_NOJOLIET "nojoliet"
#endif /* defined(MNT2_CDFS_OPT_NOJOLIET) && !defined(MNTTAB_OPT_NOJOLIET) */
#if defined(MNT2_CDFS_OPT_NOCASETRANS) && !defined(MNTTAB_OPT_NOCASETRANS)
# define MNTTAB_OPT_NOCASETRANS "nocasetrans"
#endif /* defined(MNT2_CDFS_OPT_NOCASETRANS) && !defined(MNTTAB_OPT_NOCASETRANS) */
#if defined(MNT2_CDFS_OPT_RRCASEINS) && !defined(MNTTAB_OPT_RRCASEINS)
# define MNTTAB_OPT_RRCASEINS "rrcaseins"
#endif /* defined(MNT2_CDFS_OPT_RRCASEINS) && !defined(MNTTAB_OPT_RRCASEINS) */
/*
* Complete MNTTAB_OPT_* options based on MNT2_PCFS_OPT_* mount options.
*/