]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
nfs: Bump release to install rpcbind dependency
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 May 2016 15:41:51 +0000 (16:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 May 2016 15:41:51 +0000 (16:41 +0100)
This update will pull in rpcbind as new dependency which
will automatically remove portmap when installed.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/nfs
src/paks/rpcbind/install.sh

diff --git a/lfs/nfs b/lfs/nfs
index ee9b3a059374a012f42af1b16656020d594d4dd0..42ac5b586793a88af42c6191e853039dc12c1505 100644 (file)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "rpcbind"
 
index e523183d888cd69cb72244bf2c3b874a3af93bb7..aa699f2cb69812bd9e3644919a6b1af3844cf723 100644 (file)
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+
 # remove portmap
-/etc/init.d/portmap stop
-rm -rf /etc/rc.d/rc*.d/*portmap /sbin/portmap /etc/rc.d/init.d/portmap
+if [ -e "/opt/pakfire/db/installed/meta-portmap" ]; then
+       /etc/init.d/portmap stop
+       rm -rf /etc/rc.d/rc*.d/*portmap \
+               /sbin/portmap \
+               /etc/rc.d/init.d/portmap \
+               /opt/pakfire/db/installed/meta-portmap \
+               /opt/pakfire/db/rootfiles/portmap
+fi
+
 # install rpcbind
 extract_files
 start_service --background ${NAME}