[src/trunk]: src/dist/am-utils/amd PR/3495: Koji Imada: amd timeout for ffs.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5b286e3ee6fe
branches:  trunk
changeset: 545641:5b286e3ee6fe
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 12 21:57:16 2003 +0000

description:
PR/3495: Koji Imada: amd timeout for ffs.

diffstat:

 dist/am-utils/amd/autil.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 6409a4dad835 -r 5b286e3ee6fe dist/am-utils/amd/autil.c
--- a/dist/am-utils/amd/autil.c Sat Apr 12 21:20:04 2003 +0000
+++ b/dist/am-utils/amd/autil.c Sat Apr 12 21:57:16 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autil.c,v 1.1.1.6 2003/03/09 01:13:09 christos Exp $   */
+/*     $NetBSD: autil.c,v 1.2 2003/04/12 21:57:16 christos Exp $       */
 
 /*
  * Copyright (c) 1997-2003 Erez Zadok
@@ -287,7 +287,13 @@
    * Check whether this mount should be cached permanently
    */
   if (mf->mf_fsflags & FS_NOTIMEOUT) {
-    mp->am_flags |= AMF_NOTIMEOUT;
+    mntent_t mnt;
+    mnt.mnt_opts = mf->mf_mopts;
+
+    if (mf->mf_mopts && amu_hasmntopt(&mnt, "unmount"))
+      mp->am_flags &= ~AMF_NOTIMEOUT;
+    else
+      mp->am_flags |= AMF_NOTIMEOUT;
   } else if (mf->mf_mount[1] == '\0' && mf->mf_mount[0] == '/') {
     mp->am_flags |= AMF_NOTIMEOUT;
   } else {
@@ -296,6 +302,8 @@
       mnt.mnt_opts = mf->mf_mopts;
       if (amu_hasmntopt(&mnt, "nounmount"))
        mp->am_flags |= AMF_NOTIMEOUT;
+      if (amu_hasmntopt(&mnt, "unmount"))
+       mp->am_flags &= ~AMF_NOTIMEOUT;
       if ((mp->am_timeo = hasmntval(&mnt, "utimeout")) == 0)
        mp->am_timeo = gopt.am_timeo;
     }