Skip to content

Commit 3b5eb29

Browse files
committed
Kill -r. Union makes for a poor nullfs.
1 parent dcf49a1 commit 3b5eb29

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

sbin/mount_union/mount_union.8

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: mount_union.8,v 1.17 2007/08/01 08:52:07 pooka Exp $
1+
.\" $NetBSD: mount_union.8,v 1.18 2008/02/05 16:54:07 ad Exp $
22
.\"
33
.\" Copyright (c) 1994
44
.\" The Regents of the University of California. All rights reserved.
@@ -32,15 +32,15 @@
3232
.\"
3333
.\" @(#)mount_union.8 8.7 (Berkeley) 5/1/95
3434
.\"
35-
.Dd August 1, 2007
35+
.Dd Febuary 5, 2008
3636
.Dt MOUNT_UNION 8
3737
.Os
3838
.Sh NAME
3939
.Nm mount_union
4040
.Nd mount union filesystems
4141
.Sh SYNOPSIS
4242
.Nm
43-
.Op Fl br
43+
.Op Fl b
4444
.Op Fl o Ar options
4545
.Ar directory
4646
.Ar uniondir
@@ -86,9 +86,6 @@ flag followed by a comma separated string of options.
8686
See the
8787
.Xr mount 8
8888
man page for possible options and their meanings.
89-
.It Fl r
90-
Hide the lower layer completely in the same way as mounting with
91-
.Xr mount_null 8 .
9289
.El
9390
.Pp
9491
Filenames are looked up in the upper layer and then in the

sbin/mount_union/mount_union.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_union.c,v 1.19 2007/07/16 17:06:55 pooka Exp $ */
1+
/* $NetBSD: mount_union.c,v 1.20 2008/02/05 16:54:07 ad Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
4242
#if 0
4343
static char sccsid[] = "@(#)mount_union.c 8.6 (Berkeley) 4/26/95";
4444
#else
45-
__RCSID("$NetBSD: mount_union.c,v 1.19 2007/07/16 17:06:55 pooka Exp $");
45+
__RCSID("$NetBSD: mount_union.c,v 1.20 2008/02/05 16:54:07 ad Exp $");
4646
#endif
4747
#endif /* not lint */
4848

@@ -89,7 +89,7 @@ mount_union(int argc, char *argv[])
8989

9090
mntflags = 0;
9191
args.mntflags = UNMNT_ABOVE;
92-
while ((ch = getopt(argc, argv, "bo:r")) != -1)
92+
while ((ch = getopt(argc, argv, "bo:")) != -1)
9393
switch (ch) {
9494
case 'b':
9595
args.mntflags &= ~UNMNT_OPMASK;
@@ -101,10 +101,6 @@ mount_union(int argc, char *argv[])
101101
err(1, "getmntopts");
102102
freemntopts(mp);
103103
break;
104-
case 'r':
105-
args.mntflags &= ~UNMNT_OPMASK;
106-
args.mntflags |= UNMNT_REPLACE;
107-
break;
108104
case '?':
109105
default:
110106
usage();

0 commit comments

Comments
 (0)