* amd/autil.c (am_mounted): be consistent and accept both

	"nounmount" and "noumount" as pseudo mount options (same as
	"unmount" and "umount" nearby)

diff --git a/ChangeLog b/ChangeLog
index 1d4adce4c194c2edaede967086cfaa29dbf86b26..cd7d943f0b6405cfb984378ce1e9efefefc6f805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-19  Ion Badulescu  <ionut@moisil.badula.org>
 
+       * amd/autil.c (am_mounted): be consistent and accept both
+       "nounmount" and "noumount" as pseudo mount options (same as
+       "unmount" and "umount" nearby)
+
        * amd/Makefile.am (build_version.h): fixed dependencies (depends
        on amd_OBJECTS, not OBJECTS -- which doesn't even exist)
 

diff --git a/amd/autil.c b/amd/autil.c
index f2f08e9d1c35296ddeb05e6acdcd462c66d1bb7a..cc7153c62b6cc8449b0e9a1566df3ffe3b136898 100644 (file)
--- a/amd/autil.c
+++ b/amd/autil.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: autil.c,v 1.39 2003/09/01 06:34:41 ezk Exp $
+ * $Id: autil.c,v 1.40 2003/09/20 01:09:04 ib42 Exp $
  *
  */
 
@@ -315,7 +315,7 @@ am_mounted(am_node *mp)
     mntent_t mnt;
     if (mf->mf_mopts) {
       mnt.mnt_opts = mf->mf_mopts;
-      if (amu_hasmntopt(&mnt, "nounmount"))
+      if (amu_hasmntopt(&mnt, "nounmount") || amu_hasmntopt(&mnt, "noumount"))
        mp->am_flags |= AMF_NOTIMEOUT;
       if (amu_hasmntopt(&mnt, "unmount") || amu_hasmntopt(&mnt, "umount"))
        mp->am_flags &= ~AMF_NOTIMEOUT;