[oe-commits] Amy Fong : portmap: /etc/init.d/portmap restart complains " command not found"
git at git.openembedded.org
git at git.openembedded.org
Thu May 30 19:53:30 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: cfa813dfc8d8d4d45d9f995d20322a3226a4e20b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cfa813dfc8d8d4d45d9f995d20322a3226a4e20b
Author: Amy Fong <amy.fong at windriver.com>
Date: Wed Jul 25 15:53:42 2012 +0000
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 at windriver.com>
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../portmap/portmap/portmap.init | 18 +++++++++++++-----
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 e46513e..621aa17 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}"
More information about the Openembedded-commits
mailing list