From 06de1729525f82da44ba924e8232197877fd613a Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 28 Nov 2022 19:28:51 +0100 Subject: [PATCH] Skip setcap on installs with systemd since the systemd unit uses "AmbientCapabilities" to grant capabilities. Signed-off-by: MichaIng Signed-off-by: MichaIng --- automated install/basic-install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index bdb354ec..c715eb52 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1385,11 +1385,6 @@ installConfigs() { if [[ -d '/run/systemd/system' ]]; then install -T -m 0644 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.systemd" '/etc/systemd/system/pihole-FTL.service' - # Set net admin permissions so that FTL can serve DNS, DHCP and IMAP (for DHCPv6). If this does not work, run FTL as root user. - if ! setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN,CAP_SYS_NICE,CAP_IPC_LOCK,CAP_CHOWN+eip '/usr/bin/pihole-FTL'; then - sed -i '/^User=/d' '/etc/systemd/system/pihole-FTL.service' - fi - # Remove init.d service if present if [[ -e '/etc/init.d/pihole-FTL' ]]; then rm '/etc/init.d/pihole-FTL'