macos-fstab-fun-so-fileserver-works-20040401

so we use getfsent and actually find vice partitions (and make volinfo work)

diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
index 4849a76..eeb7e7a 100644 (file)
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -38,7 +38,7 @@ DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
         clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
-        ${EXTRA_VLIBOBJS}
+        fstab.o
 
 FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 
@@ -150,7 +150,7 @@ devname.o: ${VOL}/devname.c
 
 # only for darwin
 fstab.o: ${VOL}/fstab.c
-       ${COMPILE}
+       ${CCRULE}
 
 common.o: ${VOL}/common.c
        ${CCRULE}

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 76ed38b..278d001 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -23,7 +23,7 @@ PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\
 
 VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
         clone.o nuke.o devname.o listinodes.o common.o ihandle.o \
-        namei_ops.o ${EXTRA_VLIBOBJS}
+        namei_ops.o fstab.o
 
 OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o vol-dump.o
 
@@ -160,9 +160,9 @@ gi: ${TOP_LIBDIR}/libsys.a
                        ${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \
         esac
 
-volinfo: vol-info.o physio.o ihandle.o ${LIBS}
+volinfo: vol-info.o physio.o ihandle.o fstab.o ${LIBS}
        ${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \
-               ihandle.o ${LIBS} ${XLIBS}
+               ihandle.o fstab.o ${LIBS} ${XLIBS}
 
 fs_conv_dux40D: fs_conv_411.o
        ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} ${XLIBS}

diff --git a/src/vol/fstab.c b/src/vol/fstab.c
index 46e5801..9069dd8 100644 (file)
--- a/src/vol/fstab.c
+++ b/src/vol/fstab.c
@@ -53,6 +53,8 @@
  * SUCH DAMAGE.
  */
 
+#include <afs/param.h>
+
 #if defined(AFS_DARWIN_ENV)
 /*-----------------------------------------------------------------------
  * This version of fstab.c is intended to be used on Darwin systems to