Merge git://gitorious.org/sysmocom-openembedded/meta-telephony into edison

This commit is contained in:
Holger Hans Peter Freyther 2012-09-15 16:40:09 +02:00
commit a5c48367a6
4 changed files with 13 additions and 16 deletions

View File

@ -9,7 +9,7 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3"
SRC_URI = "file://osmo-nitb.init \ SRC_URI = "file://osmo-nitb.init \
file://osmo-bsc_mgcp.init \ file://osmo-bsc_mgcp.init \
file://osmo-bsc.init" file://osmo-bsc.init"
INC_PR = "r12.${META_TELEPHONY_OSMO_INC}" INC_PR = "r13.${META_TELEPHONY_OSMO_INC}"
EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " EXTRA_OECONF += " --enable-nat --enable-osmo-bsc "

View File

@ -34,14 +34,13 @@ case "$1" in
start-stop-daemon -K -x "$DAEMON" start-stop-daemon -K -x "$DAEMON"
echo "$NAME." echo "$NAME."
;; ;;
restart|force-reload) restart)
echo -n "Restarting $DESC: " $0 stop
start-stop-daemon -K -x "$DAEMON" $0 start
echo "$NAME."
;; ;;
*) *)
N=/etc/init.d/$NAME N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2 echo "Usage: $N {start|stop|restart}" >&2
exit 1 exit 1
;; ;;
esac esac

View File

@ -34,14 +34,13 @@ case "$1" in
start-stop-daemon -K -x "$DAEMON" start-stop-daemon -K -x "$DAEMON"
echo "$NAME." echo "$NAME."
;; ;;
restart|force-reload) restart)
echo -n "Restarting $DESC: " $0 stop
start-stop-daemon -K -x "$DAEMON" $0 start
echo "$NAME."
;; ;;
*) *)
N=/etc/init.d/$NAME N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2 echo "Usage: $N {start|stop|restart}" >&2
exit 1 exit 1
;; ;;
esac esac

View File

@ -11,7 +11,7 @@
DAEMON=/usr/bin/osmo-nitb DAEMON=/usr/bin/osmo-nitb
NAME=osmo-nitb NAME=osmo-nitb
DESC="Osmocom GSM Network in the Box" DESC="Osmocom GSM Network in the Box"
NORMAL_ARGS="-D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3"
OSMOBTS_EXTRA_ARGS="" OSMOBTS_EXTRA_ARGS=""
NO_START=1 NO_START=1
@ -35,13 +35,12 @@ case "$1" in
echo "$NAME." echo "$NAME."
;; ;;
restart|force-reload) restart|force-reload)
echo -n "Restarting $DESC: " $0 stop
start-stop-daemon -K -x "$DAEMON" $0 start
echo "$NAME."
;; ;;
*) *)
N=/etc/init.d/$NAME N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2 echo "Usage: $N {start|stop|restart}" >&2
exit 1 exit 1
;; ;;
esac esac