diff --git a/nfs-utils/.footprint b/nfs-utils/.footprint index 5f1bd2a4..62ed151b 100644 --- a/nfs-utils/.footprint +++ b/nfs-utils/.footprint @@ -3,6 +3,11 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/nfs -rwxr-xr-x root/root etc/rc.d/nfsserver +drwxr-xr-x root/root sbin/ +-r-s--x--x root/root sbin/mount.nfs +lrwxrwxrwx root/root sbin/mount.nfs4 -> mount.nfs +lrwxrwxrwx root/root sbin/umount.nfs -> mount.nfs +lrwxrwxrwx root/root sbin/umount.nfs4 -> mount.nfs drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man5/ @@ -11,29 +16,29 @@ drwxr-xr-x root/root usr/man/man7/ -rw-r--r-- root/root usr/man/man7/nfsd.7.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/exportfs.8.gz --rw-r--r-- root/root usr/man/man8/lockd.8.gz +-rw-r--r-- root/root usr/man/man8/mount.nfs.8.gz -rw-r--r-- root/root usr/man/man8/mountd.8.gz -rw-r--r-- root/root usr/man/man8/nfsd.8.gz -rw-r--r-- root/root usr/man/man8/nfsstat.8.gz -lrwxrwxrwx root/root usr/man/man8/rpc.lockd.8.gz -> lockd.8.gz lrwxrwxrwx root/root usr/man/man8/rpc.mountd.8.gz -> mountd.8.gz lrwxrwxrwx root/root usr/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz -lrwxrwxrwx root/root usr/man/man8/rpc.rquotad.8.gz -> rquotad.8.gz +lrwxrwxrwx root/root usr/man/man8/rpc.sm-notify.8.gz -> sm-notify.8.gz lrwxrwxrwx root/root usr/man/man8/rpc.statd.8.gz -> statd.8.gz -rw-r--r-- root/root usr/man/man8/rpcdebug.8.gz --rw-r--r-- root/root usr/man/man8/rquotad.8.gz -rw-r--r-- root/root usr/man/man8/showmount.8.gz +-rw-r--r-- root/root usr/man/man8/sm-notify.8.gz -rw-r--r-- root/root usr/man/man8/statd.8.gz +-rw-r--r-- root/root usr/man/man8/umount.nfs.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/exportfs -rwxr-xr-x root/root usr/sbin/nfsstat --rwxr-xr-x root/root usr/sbin/rpc.lockd -rwxr-xr-x root/root usr/sbin/rpc.mountd -rwxr-xr-x root/root usr/sbin/rpc.nfsd --rwxr-xr-x root/root usr/sbin/rpc.rquotad -rwxr-xr-x root/root usr/sbin/rpc.statd -rwxr-xr-x root/root usr/sbin/rpcdebug -rwxr-xr-x root/root usr/sbin/showmount +-rwxr-xr-x root/root usr/sbin/sm-notify +-rwxr-xr-x root/root usr/sbin/start-statd drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/nfs/ diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum index 6514d1b6..c6b6cce3 100644 --- a/nfs-utils/.md5sum +++ b/nfs-utils/.md5sum @@ -1,4 +1,4 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports -73ad69a472b77946167025b946e0794a nfs -acf3656cec3872deb597aa7ac13f3c3a nfs-utils-1.0.12.tar.gz -91238e88d73c9841b9e8beb24aafa873 nfsserver +f75dd45017a56ab4ecb6e87ef40aba78 nfs +df88c6fe88a26f9797e74cb2d3291a2a nfs-utils-1.1.0.tar.gz +7222d95af7b1313985505d1494927ae5 nfsserver diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile index 92a769a9..b322d4c6 100644 --- a/nfs-utils/Pkgfile +++ b/nfs-utils/Pkgfile @@ -3,23 +3,26 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=nfs-utils -version=1.0.12 +version=1.1.0 release=1 source=(http://dl.sourceforge.net/nfs/$name-$version.tar.gz \ - exports nfs nfsserver) + exports nfs nfsserver) build () { cd $name-$version ./configure --prefix=/usr \ - --mandir=/usr/man \ - --enable-nfsv3 \ - --disable-nfsv4 \ - --disable-gss \ - --with-statedir=/var/lib/nfs \ - --sysconfdir=/etc + --mandir=/usr/man \ + --enable-nfsv3 \ + --disable-nfsv4 \ + --disable-gss \ + --with-statedir=/var/lib/nfs \ + --sysconfdir=/etc make make DESTDIR=$PKG install - install -D -m 755 ../nfs $PKG/etc/rc.d/nfs - install -D -m 755 ../nfsserver $PKG/etc/rc.d/nfsserver - install -D -m 644 ../exports $PKG/etc/exports + + rm $PKG/usr/man/man5/nfs.5 # conflict with util-linux + + install -D -m 755 $SRC/nfs $PKG/etc/rc.d/nfs + install -D -m 755 $SRC/nfsserver $PKG/etc/rc.d/nfsserver + install -D -m 644 $SRC/exports $PKG/etc/exports } diff --git a/nfs-utils/nfs b/nfs-utils/nfs old mode 100755 new mode 100644 index 990e8f6b..a8620f75 --- a/nfs-utils/nfs +++ b/nfs-utils/nfs @@ -5,6 +5,7 @@ case $1 in start) + /usr/sbin/sm-notify -q /usr/sbin/rpc.statd /bin/mount -a -t nfs ;; diff --git a/nfs-utils/nfsserver b/nfs-utils/nfsserver old mode 100755 new mode 100644 index c3a45651..3ab21bcc --- a/nfs-utils/nfsserver +++ b/nfs-utils/nfsserver @@ -5,14 +5,19 @@ case $1 in start) + /bin/mount -t nfsd nfsd /proc/fs/nfsd /usr/sbin/exportfs -r - /usr/sbin/rpc.nfsd 8 /usr/sbin/rpc.mountd + /usr/sbin/rpc.statd --no-notify + /usr/sbin/rpc.nfsd 8 + /usr/sbin/sm-notify -q ;; stop) - killall -q /usr/sbin/rpc.mountd killall -q -2 nfsd + killall -q /usr/sbin/rpc.statd + killall -q /usr/sbin/rpc.mountd /usr/sbin/exportfs -au + /bin/umount /proc/fs/nfsd ;; restart) $0 stop