Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When opening a partition to automatically determine the filesystem type, 

always use the raw partition in case it is already mounted and this is
an 'update' mount. Patch from Launey Thomas <ljt@alum.mit.edu>
This commit is contained in:
abs 2000-10-02 18:52:47 +00:00
parent 2824f4906d
commit 5087b081db
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/mount/mount.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mount.c,v 1.48 2000/09/18 10:48:24 abs Exp $ */ /* $NetBSD: mount.c,v 1.49 2000/10/02 18:52:47 abs Exp $ */
/* /*
* Copyright (c) 1980, 1989, 1993, 1994 * Copyright (c) 1980, 1989, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
#if 0 #if 0
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#else #else
__RCSID("$NetBSD: mount.c,v 1.48 2000/09/18 10:48:24 abs Exp $"); __RCSID("$NetBSD: mount.c,v 1.49 2000/10/02 18:52:47 abs Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -584,9 +584,21 @@ getfslab(str)
int part; int part;
const char *vfstype; const char *vfstype;
u_char fstype; u_char fstype;
char buf[MAXPATHLEN+1];
char *sp;
/* deduce the filesystem type from the disk label */ /* deduce the filesystem type from the disk label */
if ((fd = open(str, O_RDONLY)) == -1)
/* use raw device name */
strlcpy(buf, str, MAXPATHLEN);
if ( (sp = strrchr(buf, '/')) != NULL && *(++sp) != '\0' && *sp != 'r' ) {
char *ep;
for( ep = sp + strlen(sp) + 1 ; ep > sp ; ep-- )
*ep = *(ep-1);
*sp = 'r';
}
if ((fd = open(buf, O_RDONLY)) == -1)
err(1, "cannot open `%s'", str); err(1, "cannot open `%s'", str);
if (ioctl(fd, DIOCGDINFO, &dl) == -1) if (ioctl(fd, DIOCGDINFO, &dl) == -1)