aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-08-28 10:53:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-08-28 12:38:27 +0000
commit0a193c2d8f8467e3bbb9aee5948ab43b11d3423b (patch)
treefc8c4b32fd83900c8ab5377200eb406bbe545f45
parent0a2ff30aa228a3a3b837c73291e9c7b3e396b2f8 (diff)
downloadaports-0a193c2d8f8467e3bbb9aee5948ab43b11d3423b.tar.bz2
aports-0a193c2d8f8467e3bbb9aee5948ab43b11d3423b.tar.xz
main/samba: fix openrc script
-rw-r--r--main/samba/APKBUILD2
-rw-r--r--main/samba/samba.initd9
2 files changed, 4 insertions, 7 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index f3a87cc2c8..ff3ee70b30 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -531,6 +531,6 @@ a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe8
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8 netdb-defines.patch
202667cb0383414d9289cd67574f5e1140c9a0ff63bb82a746a59b2397a00db15654bfb30cb5ec1cd68a097899be0f849d9aab4c0d210152386c9e66c640f0c0 netapp.patch
27f12c8395be25d9806d232cc30334f2f7c7d175971d2d1944dd886d699e0381a6f222c17e3d7bc087cf7a29bfb3e98cf25ba98f414c4afe0297b9d134a28bd8 bind-9.12.patch
-6e599cfbf1248a5e9949129aff5aab0140a3bbe615e0da8c42ac44174881fb5776c4ba77c74b8cd1e6f8c471e3c3189187ea34e0728888e0d279b1d2922bece0 samba.initd
+96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44 samba.initd
9cf71d667509d94ea8d5c3329178f51d0c9aa1191ad0b940eddf5e9e77464fea137f15afbf82618976ffd8b1f5561944ade3223d157bc86c8f50e3708dcf5704 samba.confd
3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d samba.logrotate"
diff --git a/main/samba/samba.initd b/main/samba/samba.initd
index baf920ac09..71c7fb2c6f 100644
--- a/main/samba/samba.initd
+++ b/main/samba/samba.initd
@@ -2,13 +2,10 @@
extra_started_commands="reload"
piddir=${piddir:-"/run/samba"}
-daemon_list="${daemon_list//samba/}"
-DAEMON=${SVCNAME#samba.}
-if [ "$DAEMON" != "samba" ]; then
+DAEMON=${RC_SVCNAME#samba.}
+if [ "$DAEMON" != "$RC_SVCNAME" ]; then
daemon_list=$DAEMON
-elif [ "${daemon_list// /}" == "" ] || [ -z '$daemon_list' ]; then
- daemon_list="samba"
fi
depend() {
@@ -17,7 +14,7 @@ depend() {
}
start_pre() {
- [ -d "$piddir" ] || mkdir -p "$piddir"
+ checkpath --directory "$piddir"
}
start_samba() {