aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2018-06-11 12:14:43 +0200
committerJakub Jirutka <jakub@jirutka.cz>2018-06-11 12:08:32 +0200
commitd8443356f98d1c7703fdb3cf53360061b0fe7ef3 (patch)
treecafe5bfc234b46f768b70af42e9745a8293c62a8
parentdacd68bca253cc110bbcb2e6efcb4b15bf44b3f1 (diff)
downloadaports-d8443356f98d1c7703fdb3cf53360061b0fe7ef3.tar.bz2
aports-d8443356f98d1c7703fdb3cf53360061b0fe7ef3.tar.xz
main/redis: fix init script to not error when not using socket
Fixes #8979 (https://bugs.alpinelinux.org/issues/8979)
-rw-r--r--main/redis/APKBUILD4
-rw-r--r--main/redis/redis.initd2
2 files changed, 4 insertions, 2 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD
index 5f9f755d33..d788e7ccf3 100644
--- a/main/redis/APKBUILD
+++ b/main/redis/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=redis
pkgver=4.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="Advanced key-value store"
url="https://redis.io/"
arch="all"
@@ -75,7 +75,7 @@ sha512sums="a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3
5fd8a478771642b9c0dc285f1d95896f7680b94c7edab0ce60ad19ba0c2979028c7d9b0afb846dbf3e1be146ec5ded52ebb059a5b25b0a8e52bf8e57f18c0cf4 makefile-dont-duplicate-binary.patch
c8a35e3c30be99fef8678acb2502f424bcca478dcc1ef1750f8c8c8e9e9c462f97586159f32ebba84b6a4eb398a9d568e3200241fb0de1f96293c9fdaafb06c9 redis.conf.patch
d9bbb3fcc69022633d7fea3227c41d8777422ce9778623efb6aa539468fc51d2d1de09d364e21c7c8b45c61e7bbc7aaaf22745257d60ea937f77a8673facf286 sentinel.conf.patch
-a56fdf8ac3f649ae1fa74005158be7d758a670ea02224519bc0000e7ce78e0c0f65a6166ced028f558461d03eba377fa37437d5e610b5ec3ed005d9e62eae25b redis.initd
+f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738 redis.initd
6752e99df632b14d62a3266929e80c3d667be5c270e4f34e0dcf2b7f9b1754fe0ce9d4569fa413dbbe207e406ff2848a64e0c47629997536ae1d14ca84ebd56b redis.confd
e7a60a090df53eef05d58d73709f07536135a93efb34e48ad933e3859d3d1c0f476975a3232df18f57476bf7fc3b0548471e1c86445878457ac8507b3da71384 redis-sentinel.initd
bf2def2077a989047e9bfff8a7f754bcdf96e020fd4a470f8967ee1fca601e11f044cfb3742f00e932cc013e0d0b199045d78c8878a0e529715c9f77786d353f redis.logrotate"
diff --git a/main/redis/redis.initd b/main/redis/redis.initd
index 386b6e0af8..f617e005ff 100644
--- a/main/redis/redis.initd
+++ b/main/redis/redis.initd
@@ -28,6 +28,8 @@ start_pre() {
local unixsocket=$(config_get 'unixsocket')
[ "$unixsocket" ] && checkpath -d -o "$command_user" "${unixsocket%/*}"
+
+ return 0
}
config_get() {