From 7e2a8ebf41859fb685e80f78bc4a5ca2f423f14d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 12 Aug 2008 15:12:37 +0000
Subject: portmap: Remove uneeded initscript forks

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5059 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/portmap/files/portmap.init | 11 ++++-------
 meta/packages/portmap/portmap_6.0.bb     |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/meta/packages/portmap/files/portmap.init b/meta/packages/portmap/files/portmap.init
index df9e9cf8cc..e46513e115 100755
--- a/meta/packages/portmap/files/portmap.init
+++ b/meta/packages/portmap/files/portmap.init
@@ -18,13 +18,11 @@ test -f /sbin/portmap || exit 0
 
 case "$1" in
     start)
-	echo -n "Starting portmap daemon:"
-	echo -n " portmap"
+	echo "Starting portmap daemon..."
         start-stop-daemon --start --quiet --exec /sbin/portmap
-	echo "."
 
 	if [ -f /var/run/portmap.upgrade-state ]; then
-          echo -n "Restoring old RPC service information..."
+          echo "Restoring old RPC service information..."
           sleep 1 # needs a short pause or pmap_set won't work. :(
 	  pmap_set </var/run/portmap.upgrade-state
 	  rm -f /var/run/portmap.upgrade-state
@@ -33,9 +31,8 @@ case "$1" in
 
 	;;
     stop)
-        echo -n "Stopping portmap daemon:"
-        echo -n " portmap" ; start-stop-daemon --stop --quiet --exec /sbin/portmap
-        echo "."
+        echo "Stopping portmap daemon..."
+        start-stop-daemon --stop --quiet --exec /sbin/portmap
 	;;
     reload)
 	;;
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index 0892d0a9b3..7b23162ffa 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,6 +1,6 @@
 require portmap.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
            file://destdir-no-strip.patch;patch=1 \
-- 
cgit v1.2.3