nfs-utils: move to usr/bin.

This commit is contained in:
Juan RP 2015-06-02 10:56:21 +02:00
parent f1873dd88e
commit 631229df75
8 changed files with 13 additions and 14 deletions

View File

@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/blkmapd ExecStart=/usr/bin/blkmapd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -5,10 +5,10 @@ Requires=rpcbind.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/sbin/rpc.nfsd ExecStart=/usr/bin/rpc.nfsd
ExecStartPost=/usr/sbin/exportfs -a ExecStartPost=/usr/bin/exportfs -a
ExecStop=/usr/sbin/rpc.nfsd 0 ExecStop=/usr/bin/rpc.nfsd 0
ExecStopPost=/usr/sbin/exportfs -a -u ExecStopPost=/usr/bin/exportfs -a -u
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]

View File

@ -6,7 +6,7 @@ Before=remote-fs-pre.target
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/rpc.gssd ExecStart=/usr/bin/rpc.gssd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -6,7 +6,7 @@ Before=remote-fs-pre.target
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/rpc.idmapd ExecStart=/usr/bin/rpc.idmapd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -5,7 +5,7 @@ Requires=rpcbind.service nfsd.service
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/rpc.mountd ExecStart=/usr/bin/rpc.mountd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -6,7 +6,7 @@ Before=remote-fs-pre.target
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/rpc.statd ExecStart=/usr/bin/rpc.statd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -5,7 +5,7 @@ Requires=rpcbind.service
[Service] [Service]
Type=forking Type=forking
ExecStart=/usr/sbin/rpc.svcgssd ExecStart=/usr/bin/rpc.svcgssd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
# Template file for 'nfs-utils' # Template file for 'nfs-utils'
pkgname=nfs-utils pkgname=nfs-utils
version=1.3.2 version=1.3.2
revision=2 revision=3
short_desc="Network File System utilities" short_desc="Network File System utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
@ -28,7 +28,7 @@ do_configure() {
configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4 configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --with-statedir=/var/lib/nfs --enable-libmount-mount
--with-gssglue --without-tcp-wrappers --enable-ipv6 --with-gssglue --without-tcp-wrappers --enable-ipv6
--sbindir=/usr/sbin " --sbindir=/usr/bin "
./configure ${configure_args} \ ./configure ${configure_args} \
--with-tirpcinclude=$XBPS_CROSS_BASE/usr/include/tirpc \ --with-tirpcinclude=$XBPS_CROSS_BASE/usr/include/tirpc \
@ -42,8 +42,7 @@ do_build() {
do_install() { do_install() {
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install
vmkdir usr/sbin mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
# conffiles # conffiles
vconf ${FILESDIR}/exports vconf ${FILESDIR}/exports
vconf ${FILESDIR}/idmapd.conf vconf ${FILESDIR}/idmapd.conf