From a3062b5f73e8c245912487c550309de4835629d8 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 31 Mar 2022 09:51:20 -0400 Subject: [PATCH] TT#14008 install binaries in /usr/bin Neither main daemons nor auxiliary tools require root privileges to run, therefore they should go into /usr/bin instead of /usr/sbin. Change-Id: I22fd0f4e622df0362a686dfe9e0ce1fb86b43a9e --- debian/ngcp-rtpengine-daemon.install | 2 +- debian/ngcp-rtpengine-daemon.service | 2 +- debian/ngcp-rtpengine-recording-daemon.install | 2 +- debian/ngcp-rtpengine-recording-daemon.service | 2 +- debian/ngcp-rtpengine-utils.install | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/ngcp-rtpengine-daemon.install b/debian/ngcp-rtpengine-daemon.install index 999175533..e00f63bdb 100644 --- a/debian/ngcp-rtpengine-daemon.install +++ b/debian/ngcp-rtpengine-daemon.install @@ -1,3 +1,3 @@ -daemon/rtpengine /usr/sbin/ +daemon/rtpengine /usr/bin/ debian/ngcp-rtpengine-iptables-setup /usr/sbin etc/rtpengine.conf /etc/rtpengine/ diff --git a/debian/ngcp-rtpengine-daemon.service b/debian/ngcp-rtpengine-daemon.service index be9b324ce..9a272b87b 100644 --- a/debian/ngcp-rtpengine-daemon.service +++ b/debian/ngcp-rtpengine-daemon.service @@ -14,7 +14,7 @@ Group=rtpengine AmbientCapabilities=CAP_NET_ADMIN CAP_SYS_NICE LimitNOFILE=150000 ExecStartPre=+/usr/sbin/ngcp-rtpengine-iptables-setup start -ExecStart=/usr/sbin/rtpengine -f -E --no-log-timestamps --pidfile /run/rtpengine/ngcp-rtpengine-daemon.pid --config-file /etc/rtpengine/rtpengine.conf +ExecStart=/usr/bin/rtpengine -f -E --no-log-timestamps --pidfile /run/rtpengine/ngcp-rtpengine-daemon.pid --config-file /etc/rtpengine/rtpengine.conf ExecStopPost=+/usr/sbin/ngcp-rtpengine-iptables-setup stop [Install] diff --git a/debian/ngcp-rtpengine-recording-daemon.install b/debian/ngcp-rtpengine-recording-daemon.install index 40e0aa1be..83a9d39d9 100644 --- a/debian/ngcp-rtpengine-recording-daemon.install +++ b/debian/ngcp-rtpengine-recording-daemon.install @@ -1,3 +1,3 @@ debian/ngcp-rtpengine-recording-nfs-setup /usr/sbin/ etc/rtpengine-recording.conf /etc/rtpengine/ -recording-daemon/rtpengine-recording /usr/sbin/ +recording-daemon/rtpengine-recording /usr/bin/ diff --git a/debian/ngcp-rtpengine-recording-daemon.service b/debian/ngcp-rtpengine-recording-daemon.service index f4bca109d..81e155e60 100644 --- a/debian/ngcp-rtpengine-recording-daemon.service +++ b/debian/ngcp-rtpengine-recording-daemon.service @@ -14,7 +14,7 @@ PIDFile=/run/rtpengine-recording/ngcp-rtpengine-recording-daemon.pid AmbientCapabilities=CAP_NET_ADMIN User=rtpengine Group=rtpengine -ExecStart=/usr/sbin/rtpengine-recording -f -E --no-log-timestamps --pidfile /run/rtpengine-recording/ngcp-rtpengine-recording-daemon.pid --config-file /etc/rtpengine/rtpengine-recording.conf +ExecStart=/usr/bin/rtpengine-recording -f -E --no-log-timestamps --pidfile /run/rtpengine-recording/ngcp-rtpengine-recording-daemon.pid --config-file /etc/rtpengine/rtpengine-recording.conf [Install] WantedBy=multi-user.target diff --git a/debian/ngcp-rtpengine-utils.install b/debian/ngcp-rtpengine-utils.install index c988b902c..5045d6ca4 100644 --- a/debian/ngcp-rtpengine-utils.install +++ b/debian/ngcp-rtpengine-utils.install @@ -1,4 +1,4 @@ perl/* /usr/share/perl5/ -utils/rtpengine-ctl /usr/sbin/ +utils/rtpengine-ctl /usr/bin/ utils/rtpengine-get-table /usr/libexec/rtpengine/ -utils/rtpengine-ng-client /usr/sbin/ +utils/rtpengine-ng-client /usr/bin/