diff options
| author | bmilekic <bmilekic@FreeBSD.org> | 2004-04-26 15:13:46 +0000 |
|---|---|---|
| committer | bmilekic <bmilekic@FreeBSD.org> | 2004-04-26 15:13:46 +0000 |
| commit | 788a94ec838387260dd50d92bd05d96aff3db843 (patch) | |
| tree | c329cf1b1baaf177a2a5572ee6d04cedc2c6371f /sbin/mount | |
| parent | 590a18f52ca14f52edaf8e4f3de51d707b0fc5b4 (diff) | |
| download | FreeBSD-src-788a94ec838387260dd50d92bd05d96aff3db843.zip FreeBSD-src-788a94ec838387260dd50d92bd05d96aff3db843.tar.gz | |
The previous change to mount(8) to report ufs or ufs2 used
libufs, which only works for Charlie root.
This change reverts the introduction of libufs and moves the
check into the kernel. Since the f_fstypename is the same
for both ufs and ufs2, we check fs_magic for presence of
ufs2 and copy "ufs2" explicitly instead.
Submitted by: Christian S.J. Peron <maneo@bsdpro.com>
Diffstat (limited to 'sbin/mount')
| -rw-r--r-- | sbin/mount/Makefile | 2 | ||||
| -rw-r--r-- | sbin/mount/mount.c | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile index e9e4fdf..407abea 100644 --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -3,8 +3,6 @@ PROG= mount SRCS= mount.c mount_ufs.c getmntopts.c vfslist.c -DPADD= ${LIBUFS} -LDADD= -lufs WARNS?= 0 MAN= mount.8 # We do NOT install the getmntopts.3 man page. diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 5f6a950..df97adb 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -46,10 +46,6 @@ static const char rcsid[] = #include <sys/stat.h> #include <sys/wait.h> -#include <ufs/ufs/ufsmount.h> -#include <ufs/ufs/dinode.h> -#include <ufs/ffs/fs.h> - #include <ctype.h> #include <err.h> #include <errno.h> @@ -62,7 +58,6 @@ static const char rcsid[] = #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <libufs.h> #include "extern.h" #include "mntopts.h" @@ -515,16 +510,10 @@ prmount(sfp) int flags, i; struct opt *o; struct passwd *pw; - struct uufsd disk; (void)printf("%s on %s (%s", sfp->f_mntfromname, sfp->f_mntonname, sfp->f_fstypename); - if (strncmp(sfp->f_fstypename, "ufs", 3) == 0) { - ufs_disk_fillout(&disk, sfp->f_mntonname); - printf("%s", (disk.d_ufs == 2) ? "2" : ""); - } - flags = sfp->f_flags & MNT_VISFLAGMASK; for (o = optnames; flags && o->o_opt; o++) if (flags & o->o_opt) { |
