aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2020-11-11 12:44:52 +0100
committerJakub Jirutka <jakub@jirutka.cz>2020-11-22 21:01:50 +0000
commit65bb5fcef30e615905d8bcd30d2dfcc8c54822e0 (patch)
tree5337338e523b26b8769aebfeef6c913f28fde5df
parent1c1ad48537a6e21fe0887172569cb7b940c65ee9 (diff)
downloadaports-65bb5fcef30e615905d8bcd30d2dfcc8c54822e0.tar.gz
aports-65bb5fcef30e615905d8bcd30d2dfcc8c54822e0.tar.bz2
aports-65bb5fcef30e615905d8bcd30d2dfcc8c54822e0.tar.xz
main/dhcp: fix missing dhcp usr/grp in dhcrelay
Closes #12083
-rw-r--r--main/dhcp/APKBUILD3
-rw-r--r--main/dhcp/dhcrelay.pre-install6
2 files changed, 8 insertions, 1 deletions
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 3d17444b61..736011a6de 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
pkgname=dhcp
pkgver=4.4.2
_realver=${pkgver/_p/-P}
-pkgrel=2
+pkgrel=3
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
arch="all"
@@ -170,6 +170,7 @@ dhcrelay() {
pkgdesc="ISC dhcp relay server"
depends="$_depends_dhcrelay"
replaces="dhcp"
+ install="$subpkgname.pre-install"
install -d "$subpkgdir"/run/dhcp \
"$subpkgdir"/usr/sbin
diff --git a/main/dhcp/dhcrelay.pre-install b/main/dhcp/dhcrelay.pre-install
new file mode 100644
index 0000000000..6aa3de03be
--- /dev/null
+++ b/main/dhcp/dhcrelay.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
+
+exit 0