nfs-utils: merge -server subpkg; should fix runit service.
This commit is contained in:
parent
f15fd5dc2c
commit
b80e783663
|
@ -1 +0,0 @@
|
||||||
nfs-utils
|
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
umount -l /proc/fs/nfsd
|
umount -l /proc/fs/nfsd
|
||||||
umount -l /var/lib/nfs/rpc_pipefs
|
umount -l /var/lib/nfs/rpc_pipefs
|
||||||
/usr/sbin/rpc.nfsd -- 0
|
rpc.nfsd -- 0
|
||||||
/usr/sbin/exportfs -a -u
|
exportfs -a -u
|
||||||
|
|
|
@ -23,6 +23,6 @@ if ! mountpoint -q /proc/fs/nfsd; then
|
||||||
mount -t nfsd nfsd /proc/fs/nfsd || exit 1
|
mount -t nfsd nfsd /proc/fs/nfsd || exit 1
|
||||||
fi
|
fi
|
||||||
exportfs -ra > /dev/null || exit 1
|
exportfs -ra > /dev/null || exit 1
|
||||||
rpc.nfsd -- $PROCESSES || exit 1
|
rpc.nfsd -- ${PROCESSES:=4} || exit 1
|
||||||
|
|
||||||
exec rpc.mountd --foreground
|
exec rpc.mountd --foreground
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Template file for 'nfs-utils'
|
# Template file for 'nfs-utils'
|
||||||
pkgname=nfs-utils
|
pkgname=nfs-utils
|
||||||
version=1.3.1
|
version=1.3.1
|
||||||
revision=2
|
revision=3
|
||||||
short_desc="Network File System client utilities"
|
short_desc="Network File System utilities"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://nfs.sourceforge.net"
|
homepage="http://nfs.sourceforge.net"
|
||||||
|
@ -15,11 +15,14 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel
|
||||||
libevent-devel device-mapper-devel libcap-devel mit-krb5-devel
|
libevent-devel device-mapper-devel libcap-devel mit-krb5-devel
|
||||||
libblkid-devel sqlite-devel"
|
libblkid-devel sqlite-devel"
|
||||||
depends="rpcbind"
|
depends="rpcbind"
|
||||||
conf_files="/etc/idmapd.conf"
|
conf_files="/etc/exports /etc/idmapd.conf"
|
||||||
replaces="runit-void<20141013_2"
|
replaces="nfs-utils-server>=0"
|
||||||
make_dirs="
|
make_dirs="
|
||||||
/var/lib/nfs/rpc_pipefs 0755 root root
|
/var/lib/nfs/rpc_pipefs 0755 root root
|
||||||
/var/lib/nfs/sm 0750 root root"
|
/var/lib/nfs/sm 0750 root root
|
||||||
|
/var/lib/nfs/v4recovery 0755 root root
|
||||||
|
/etc/exports.d 0750 root root
|
||||||
|
"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
|
configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
|
||||||
|
@ -44,7 +47,9 @@ do_install() {
|
||||||
# conffiles
|
# conffiles
|
||||||
vconf ${FILESDIR}/exports
|
vconf ${FILESDIR}/exports
|
||||||
vconf ${FILESDIR}/idmapd.conf
|
vconf ${FILESDIR}/idmapd.conf
|
||||||
|
# runit services
|
||||||
vsv statd
|
vsv statd
|
||||||
|
vsv nfs-server
|
||||||
# systemd glue
|
# systemd glue
|
||||||
if [ "$build_option_systemd" ]; then
|
if [ "$build_option_systemd" ]; then
|
||||||
vmkdir usr/lib/systemd/system
|
vmkdir usr/lib/systemd/system
|
||||||
|
@ -53,35 +58,3 @@ do_install() {
|
||||||
|
|
||||||
rm -rf ${DESTDIR}/var/lib/nfs
|
rm -rf ${DESTDIR}/var/lib/nfs
|
||||||
}
|
}
|
||||||
|
|
||||||
nfs-utils-server_package() {
|
|
||||||
short_desc="Network File System utilities - Server utilities"
|
|
||||||
depends="rpcbind"
|
|
||||||
replaces="runit-void<20141013_2"
|
|
||||||
conf_files="/etc/exports"
|
|
||||||
make_dirs="
|
|
||||||
/var/lib/nfs/v4recovery 0755 root root
|
|
||||||
/var/lib/nfs/sm 0750 root root
|
|
||||||
/etc/exports.d 0750 root root"
|
|
||||||
pkg_install() {
|
|
||||||
vmove etc/exports
|
|
||||||
for f in exportfs rpc.mountd rpc.nfsd blkmapd rpc.svcgssd; do
|
|
||||||
vmove usr/sbin/${f}
|
|
||||||
[ "$f" = "blkmapd" ] && continue
|
|
||||||
vmove usr/share/man/man8/$(basename ${f}).8
|
|
||||||
done
|
|
||||||
for f in mountd nfsd svcgssd; do
|
|
||||||
vmove usr/share/man/man8/${f}.8
|
|
||||||
done
|
|
||||||
vmove usr/share/man/man5
|
|
||||||
vmove usr/share/man/man7
|
|
||||||
if [ "$build_option_systemd" ]; then
|
|
||||||
for f in blkmapd nfsd rpc-mountd rpc-svcgssd; do
|
|
||||||
vmove usr/lib/systemd/system/${f}.service
|
|
||||||
done
|
|
||||||
vmove usr/lib/systemd/system/proc-fs-nfsd.mount
|
|
||||||
fi
|
|
||||||
# runit services
|
|
||||||
vsv nfs-server
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue