From a432762d9a3352eaa7af3e96821864ce1bc22c95 Mon Sep 17 00:00:00 2001
From: erh <erh@NetBSD.org>
Date: Mon, 31 Jan 2005 01:19:30 +0000
Subject: [PATCH] Fix PR#3205 for the -a case: when the list of mount points
 comes from the kernel, always use "raw" mode (-R option) so unmounting odd
 mount points works. Also, fix available options in SMALL mode to include -R,
 not -r.

---
 sbin/umount/umount.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index b09ebc56a6bc..51e9945d5b79 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umount.c,v 1.36 2005/01/19 20:43:06 xtraeme Exp $	*/
+/*	$NetBSD: umount.c,v 1.37 2005/01/31 01:19:30 erh Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1989, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: umount.c,v 1.36 2005/01/19 20:43:06 xtraeme Exp $");
+__RCSID("$NetBSD: umount.c,v 1.37 2005/01/31 01:19:30 erh Exp $");
 #endif
 #endif /* not lint */
 
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
 	sync();
 
 #ifdef SMALL
-#define OPTS "fr"
+#define OPTS "fR"
 #else
 #define OPTS "AaFfh:Rt:v"
 #endif
@@ -161,7 +161,7 @@ main(int argc, char *argv[])
 			if (checkvfsname(mntbuf[mnts].f_fstypename, typelist))
 				continue;
 			if (umountfs(mntbuf[mnts].f_mntonname, typelist,
-				     raw) != 0)
+			             1) != 0)
 				errs = 1;
 		}
 	} else