Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support .. osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 3 insertions(+), 179 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start:$network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -#Mobile Switching Center, Home Location regster and all other -#components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started -/sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) -#[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" -
Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Sep 2018 08:01:21 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10951 ) Change subject: osmo-ggsn: Drop untested sysvinit support .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 Gerrit-Change-Number: 10951 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Sep 2018 16:21:06 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in meta-telephony[laforge/nightly]: osmo-ggsn: Drop untested sysvinit support
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10951 Change subject: osmo-ggsn: Drop untested sysvinit support .. osmo-ggsn: Drop untested sysvinit support These bits come from times were sysvinit was used in stead of systemd in yocto. Nowadays nobody is known to be using the recipes with sysvinit instead of systemd, and anyway most osmocom recipes doesn't come with sysvinit support, so let's drop it. If sysvinit support is required, it should be added through autotools install process instead. Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 --- D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 3 files changed, 3 insertions(+), 179 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/10951/1 diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init deleted file mode 100755 index 157d6dd..000 --- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-ggsn -# Required-Start:$network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Osmocom GSM network-in-a-box -# Description: A minimal implementation of the GSM Base Station Controller, -#Mobile Switching Center, Home Location regster and all other -#components to run a self-contained GSM network. -### END INIT INFO - -# Author: Harald Welte - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Osmocom GGSN implementation" -NAME=osmo-ggsn -DAEMON=/usr/bin/ggsn -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CONFIG_FILE=/etc/ggsn.conf - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -# . /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -# . /lib/lsb/init-functions - -DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started -/sbin/modprobe tun - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - - # Check for runtime directory of nonvolatile data - if [ ! -d /var/lib/ggsn ]; then - mkdir /var/lib/ggsn - fi - - # Check for GTP restart counter - if [ ! -f /var/lib/ggsn/gsn_restart ]; then - echo 0 > /var/lib/ggsn/gsn_restart - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) -#[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" -do_s