diff options
| author | iedowse <iedowse@FreeBSD.org> | 2003-12-05 09:22:40 +0000 |
|---|---|---|
| committer | iedowse <iedowse@FreeBSD.org> | 2003-12-05 09:22:40 +0000 |
| commit | c0307eb60b621aeaca5f23bd5c4e435b34660aa0 (patch) | |
| tree | 0a84fd4f8e68acfe074b83fb8206604cfd8c4b06 /sbin/umount | |
| parent | 4b6e70136eaba65e7cab31651ffef37233c3c9e5 (diff) | |
| download | FreeBSD-src-c0307eb60b621aeaca5f23bd5c4e435b34660aa0.zip FreeBSD-src-c0307eb60b621aeaca5f23bd5c4e435b34660aa0.tar.gz | |
Don't include the file system ID in the output of `mount -v' if it
is all zeros. The kernel now consistently zeroes FSIDs for non-root
users, so there's no point in printing these. Also fix a misspelling
in a comment.
Submitted by: Rudolf Cejka <cejkar@fit.vutbr.cz>
Approved by: re (scottl)
Diffstat (limited to 'sbin/umount')
| -rw-r--r-- | sbin/umount/umount.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 4c2b824..f2b2444 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -365,8 +365,9 @@ umountfs(struct statfs *sfs) warn("unmount of %s failed", sfs->f_mntonname); if (errno != ENOENT) return (1); - /* Compatability for old kernels. */ - warnx("retrying using path instead of file system ID"); + /* Compatibility for old kernels. */ + if (sfs->f_fsid.val[0] != 0 || sfs->f_fsid.val[1] != 0) + warnx("retrying using path instead of file system ID"); if (unmount(sfs->f_mntonname, fflag) != 0) { warn("unmount of %s failed", sfs->f_mntonname); return (1); @@ -557,7 +558,7 @@ mntinfo(struct statfs **mntbuf) } /* - * Convert a hexidecimal filesystem ID to an fsid_t. + * Convert a hexadecimal filesystem ID to an fsid_t. * Returns 0 on success. */ int |
