[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1193d00f514a5fb91652ab6fbfb35cacc607af0c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1193d00f514a5fb91652ab6fbfb35cacc607af0c

[git]

[-- Attachment #1: Type: text/plain, Size: 2293 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1193d00f514a5fb91652ab6fbfb35cacc607af0c (commit)
      from  3fcc9b67fc7ab1886244a647dd7cf98f00e5c555 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1193d00f514a5fb91652ab6fbfb35cacc607af0c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 18 16:41:51 2016 +0100

    nfs: Bump release to install rpcbind dependency
    
    This update will pull in rpcbind as new dependency which
    will automatically remove portmap when installed.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/nfs                     |  2 +-
 src/paks/rpcbind/install.sh | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/nfs b/lfs/nfs
index ee9b3a0..42ac5b5 100644
--- 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"
 
diff --git a/src/paks/rpcbind/install.sh b/src/paks/rpcbind/install.sh
index e523183..aa699f2 100644
--- a/src/paks/rpcbind/install.sh
+++ b/src/paks/rpcbind/install.sh
@@ -22,9 +22,17 @@
 ############################################################################
 #
 . /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}


hooks/post-receive
--
IPFire 2.x development tree