summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2012-07-25 15:53:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-30 20:58:54 +0100
commitcfa813dfc8d8d4d45d9f995d20322a3226a4e20b (patch)
tree16b68ab9b127a4b4b4dabf8b885b6098aa695810
parentd9f9bfed56ef8562256fc01c3e42e15734230c3a (diff)
downloadopenembedded-core-cfa813dfc8d8d4d45d9f995d20322a3226a4e20b.tar.gz
openembedded-core-cfa813dfc8d8d4d45d9f995d20322a3226a4e20b.tar.bz2
openembedded-core-cfa813dfc8d8d4d45d9f995d20322a3226a4e20b.zip
portmap: /etc/init.d/portmap restart complains "command not found"
portmap splits pmap_dump and pmap_set into a different package: portmap_utils. Since this package might not be installed, I introduce another init file that tests for the existance of these apps before trying to run the pmap_* commands. Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-connectivity/portmap/portmap/portmap.init18
1 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/portmap/portmap/portmap.init b/meta/recipes-connectivity/portmap/portmap/portmap.init
index e46513e115..621aa171ae 100755
--- a/meta/recipes-connectivity/portmap/portmap/portmap.init
+++ b/meta/recipes-connectivity/portmap/portmap/portmap.init
@@ -40,14 +40,22 @@ case "$1" in
$0 restart
;;
restart)
- pmap_dump >/var/run/portmap.state
+ # pmap_dump and pmap_set may be in a different package and not installed...
+ if [ -f /sbin/pmap_dump -a -f /sbin/pmap_set ]; then
+ do_state=1
+ else
+ do_state=0
+ fi
+ [ $do_state -eq 1 ] && pmap_dump >/var/run/portmap.state
$0 stop
$0 start
- if [ ! -f /var/run/portmap.upgrade-state ]; then
- sleep 1
- pmap_set </var/run/portmap.state
+ if [ $do_state -eq 1 ]; then
+ if [ ! -f /var/run/portmap.upgrade-state ]; then
+ sleep 1
+ pmap_set </var/run/portmap.state
+ fi
+ rm -f /var/run/portmap.state
fi
- rm -f /var/run/portmap.state
;;
*)
echo "Usage: /etc/init.d/portmap {start|stop|reload|restart}"