Page MenuHomeFreeBSD
Files F150432668

D2045.id6337.diff
No OneTemporary
Actions

D2045.id6337.diff
View Options

Index: usr.sbin/fstyp/Makefile
===================================================================
--- usr.sbin/fstyp/Makefile
+++ usr.sbin/fstyp/Makefile
@@ -5,18 +5,18 @@
PROG= fstyp
SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
SRCS += zfs.c
.endif
MAN= fstyp.8
-WARNS= 6
+WARNS= 0
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
-CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL
+CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS
CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem
@@ -33,7 +33,7 @@
DPADD= ${LIBGEOM} ${LIBMD}
LDADD= -lgeom -lmd
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
DPADD += ${LIBNVPAIR} ${LIBZFS}
LDADD += -lnvpair -lzfs
.endif
Index: usr.sbin/fstyp/fstyp.h
===================================================================
--- usr.sbin/fstyp/fstyp.h
+++ usr.sbin/fstyp/fstyp.h
@@ -44,7 +44,7 @@
int fstyp_msdosfs(FILE *fp, char *label, size_t size);
int fstyp_ntfs(FILE *fp, char *label, size_t size);
int fstyp_ufs(FILE *fp, char *label, size_t size);
-#ifdef HAVE_CDDL
+#ifdef HAVE_ZFS
int fstyp_zfs(FILE *fp, char *label, size_t size);
#endif
Index: usr.sbin/fstyp/fstyp.c
===================================================================
--- usr.sbin/fstyp/fstyp.c
+++ usr.sbin/fstyp/fstyp.c
@@ -63,7 +63,7 @@
{ "msdosfs", &fstyp_msdosfs, false },
{ "ntfs", &fstyp_ntfs, false },
{ "ufs", &fstyp_ufs, false },
-#ifdef HAVE_CDDL
+#ifdef HAVE_ZFS
{ "zfs", &fstyp_zfs, true },
#endif
{ NULL, NULL, NULL }

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 4:55 AM (18 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30705001
Default Alt Text
D2045.id6337.diff (1 KB)

Event Timeline