<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17772">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Get rid of install top directory<br><br>Some content there is out of date, or should be mvoed to utils/ with the<br>rest of installable stuff.<br><br>Change-Id: I17ee94b175deb88faff71e7788c482093693f8a8<br>---<br>D install/ofono.service<br>D install/org.ofono.conf<br>D install/osmo-gsm-tester-limits.conf<br>A utils/dbus-1/dbus_osmo-gsm-tester.conf<br>R utils/systemd/osmo-gsm-tester.service<br>5 files changed, 9 insertions(+), 43 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/install/ofono.service b/install/ofono.service</span><br><span>deleted file mode 100644</span><br><span>index 0aa9fbe..0000000</span><br><span>--- a/install/ofono.service</span><br><span>+++ /dev/null</span><br><span>@@ -1,11 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# systemd service file for the ofono daemon</span><br><span style="color: hsl(0, 100%, 40%);">-[Unit]</span><br><span style="color: hsl(0, 100%, 40%);">-Description=oFono</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[Service]</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/local/src/ofono/src/ofonod -n</span><br><span style="color: hsl(0, 100%, 40%);">-Restart=always</span><br><span style="color: hsl(0, 100%, 40%);">-StartLimitInterval=0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[Install]</span><br><span style="color: hsl(0, 100%, 40%);">-WantedBy=multi-user.target</span><br><span>diff --git a/install/org.ofono.conf b/install/org.ofono.conf</span><br><span>deleted file mode 100644</span><br><span>index 8b13c75..0000000</span><br><span>--- a/install/org.ofono.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,28 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<!-- This configuration file specifies the required security policies</span><br><span style="color: hsl(0, 100%, 40%);">- for oFono core daemon to work. It lives in /etc/dbus-1/system.d/ --></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"</span><br><span style="color: hsl(0, 100%, 40%);">- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-<busconfig></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- ../system.conf have denied everything, so we just punch some holes --></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <policy user="root"></span><br><span style="color: hsl(0, 100%, 40%);">- <allow own="org.ofono"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_destination="org.ofono"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_interface="org.ofono.SimToolkitAgent"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_interface="org.ofono.PushNotificationAgent"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_interface="org.ofono.SmartMessagingAgent"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_interface="org.ofono.PositioningRequestAgent"/></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_interface="org.ofono.HandsfreeAudioAgent"/></span><br><span style="color: hsl(0, 100%, 40%);">- </policy></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <policy at_console="true"></span><br><span style="color: hsl(0, 100%, 40%);">- <allow send_destination="org.ofono"/></span><br><span style="color: hsl(0, 100%, 40%);">- </policy></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <policy context="default"></span><br><span style="color: hsl(0, 100%, 40%);">- <deny send_destination="org.ofono"/></span><br><span style="color: hsl(0, 100%, 40%);">- </policy></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</busconfig></span><br><span>diff --git a/install/osmo-gsm-tester-limits.conf b/install/osmo-gsm-tester-limits.conf</span><br><span>deleted file mode 100644</span><br><span>index 1fb0738..0000000</span><br><span>--- a/install/osmo-gsm-tester-limits.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# place this file in /etc/security/limits.d to allow core files when a program</span><br><span style="color: hsl(0, 100%, 40%);">-# crashes; for osmo-gsm-tester.</span><br><span style="color: hsl(0, 100%, 40%);">-root - core unlimited</span><br><span style="color: hsl(0, 100%, 40%);">-* - core unlimited</span><br><span>diff --git a/utils/dbus-1/dbus_osmo-gsm-tester.conf b/utils/dbus-1/dbus_osmo-gsm-tester.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d867833</span><br><span>--- /dev/null</span><br><span>+++ b/utils/dbus-1/dbus_osmo-gsm-tester.conf</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<!-- Additional rules for the osmo-gsm-tester to access org.ofono from user</span><br><span style="color: hsl(120, 100%, 40%);">+land --></span><br><span style="color: hsl(120, 100%, 40%);">+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"</span><br><span style="color: hsl(120, 100%, 40%);">+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"></span><br><span style="color: hsl(120, 100%, 40%);">+<busconfig></span><br><span style="color: hsl(120, 100%, 40%);">+<policy group="osmo-gsm-tester"></span><br><span style="color: hsl(120, 100%, 40%);">+<allow send_destination="org.ofono"/></span><br><span style="color: hsl(120, 100%, 40%);">+</policy></span><br><span style="color: hsl(120, 100%, 40%);">+</busconfig></span><br><span>diff --git a/install/osmo-gsm-tester.service b/utils/systemd/osmo-gsm-tester.service</span><br><span>similarity index 100%</span><br><span>rename from install/osmo-gsm-tester.service</span><br><span>rename to utils/systemd/osmo-gsm-tester.service</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17772">change 17772</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/c/osmo-gsm-tester/+/17772"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I17ee94b175deb88faff71e7788c482093693f8a8 </div>
<div style="display:none"> Gerrit-Change-Number: 17772 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>