<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13423">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: Remove deprecated screen script helpers<br><br>Nowadays only known users (OE images) use systemd and don't require this<br>kind of screen setup.<br>In any case, this kind of file belongs to scpeific setup and are not<br>needed here.<br><br>Change-Id: I65b0eee44336e4627620443861092b8988f2e01d<br>---<br>M Makefile.am<br>D contrib/l1fwd.init<br>D contrib/respawn-only.sh<br>D contrib/respawn.sh<br>D contrib/screenrc-l1fwd<br>D contrib/screenrc-sysmobts<br>6 files changed, 1 insertion(+), 72 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index e403f5e..62bad69 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -5,8 +5,7 @@</span><br><span> </span><br><span> # package the contrib and doc</span><br><span> EXTRA_DIST = \</span><br><span style="color: hsl(0, 100%, 40%);">- contrib/dump_docs.py contrib/screenrc-l1fwd \</span><br><span style="color: hsl(0, 100%, 40%);">- contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/dump_docs.py \</span><br><span> git-version-gen .version \</span><br><span> README.md</span><br><span> </span><br><span>diff --git a/contrib/l1fwd.init b/contrib/l1fwd.init</span><br><span>deleted file mode 100755</span><br><span>index b228580..0000000</span><br><span>--- a/contrib/l1fwd.init</span><br><span>+++ /dev/null</span><br><span>@@ -1,31 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-### BEGIN INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-# Provides: l1fwd</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Start: </span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Stop: $local_fs</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Start: 5</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Stop: 0 6</span><br><span style="color: hsl(0, 100%, 40%);">-# Short-Description: Start screen session with l1fwd software</span><br><span style="color: hsl(0, 100%, 40%);">-# Description: </span><br><span style="color: hsl(0, 100%, 40%);">-### END INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-. /etc/default/rcS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">- start)</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/bin/screen -d -m -c /etc/osmocom/screenrc-l1fwd</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- stop)</span><br><span style="color: hsl(0, 100%, 40%);">- echo "This script doesn't support stop"</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- restart|reload|force-reload)</span><br><span style="color: hsl(0, 100%, 40%);">- exit 0</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- show)</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- echo "Usage: sysmobts {start|stop|show|reload|restart}" >&2</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span>diff --git a/contrib/respawn-only.sh b/contrib/respawn-only.sh</span><br><span>deleted file mode 100755</span><br><span>index 478abd6..0000000</span><br><span>--- a/contrib/respawn-only.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-PID=$$</span><br><span style="color: hsl(0, 100%, 40%);">-echo "-1000" > /proc/$PID/oom_score_adj</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-trap "{ kill 0; kill -2 0; }" EXIT</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-while [ -f $1 ]; do</span><br><span style="color: hsl(0, 100%, 40%);">- (echo "0" > /proc/self/oom_score_adj && exec nice -n -20 $*) &</span><br><span style="color: hsl(0, 100%, 40%);">- LAST_PID=$!</span><br><span style="color: hsl(0, 100%, 40%);">- wait $LAST_PID</span><br><span style="color: hsl(0, 100%, 40%);">- sleep 10s</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span>diff --git a/contrib/respawn.sh b/contrib/respawn.sh</span><br><span>deleted file mode 100755</span><br><span>index 196edad..0000000</span><br><span>--- a/contrib/respawn.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,18 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-PID=$$</span><br><span style="color: hsl(0, 100%, 40%);">-echo "-1000" > /proc/$PID/oom_score_adj</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-trap "kill 0" EXIT</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-while [ -e /etc/passwd ]; do</span><br><span style="color: hsl(0, 100%, 40%);">- cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0</span><br><span style="color: hsl(0, 100%, 40%);">- sleep 2s</span><br><span style="color: hsl(0, 100%, 40%);">- cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0</span><br><span style="color: hsl(0, 100%, 40%);">- sleep 1s</span><br><span style="color: hsl(0, 100%, 40%);">- echo "0" > /sys/class/leds/activity_led/brightness</span><br><span style="color: hsl(0, 100%, 40%);">- (echo "0" > /proc/self/oom_score_adj && exec nice -n -20 $*) &</span><br><span style="color: hsl(0, 100%, 40%);">- LAST_PID=$!</span><br><span style="color: hsl(0, 100%, 40%);">- wait $LAST_PID</span><br><span style="color: hsl(0, 100%, 40%);">- sleep 10s</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span>diff --git a/contrib/screenrc-l1fwd b/contrib/screenrc-l1fwd</span><br><span>deleted file mode 100644</span><br><span>index 4256a38..0000000</span><br><span>--- a/contrib/screenrc-l1fwd</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-chdir /tmp</span><br><span style="color: hsl(0, 100%, 40%);">-screen -t BTS 0 /etc/osmocom/respawn.sh /usr/bin/l1fwd-proxy</span><br><span style="color: hsl(0, 100%, 40%);">-detach</span><br><span>diff --git a/contrib/screenrc-sysmobts b/contrib/screenrc-sysmobts</span><br><span>deleted file mode 100644</span><br><span>index 9c810d9..0000000</span><br><span>--- a/contrib/screenrc-sysmobts</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-chdir /tmp</span><br><span style="color: hsl(0, 100%, 40%);">-screen -t BTS 0 /etc/osmocom/respawn.sh /usr/bin/osmo-bts-sysmo -c /etc/osmocom/osmo-bts.cfg -r 1 -M</span><br><span style="color: hsl(0, 100%, 40%);">-screen -t PCU 1 /etc/osmocom/respawn-only.sh /usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg -e</span><br><span style="color: hsl(0, 100%, 40%);">-screen -t MGR 2 /etc/osmocom/respawn-only.sh /usr/bin/sysmobts-mgr -n -c /etc/osmocom/sysmobts-mgr.cfg</span><br><span style="color: hsl(0, 100%, 40%);">-detach</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13423">change 13423</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13423"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I65b0eee44336e4627620443861092b8988f2e01d </div>
<div style="display:none"> Gerrit-Change-Number: 13423 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>