Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 910589
Collapse All | Expand All

(-)a/openrc/init.d/php-fpm.in.in (-4 / +15 lines)
Lines 17-25 Link Here
17
#
17
#
18
18
19
PHP_SLOT="${SVCNAME#php-fpm-}"
19
PHP_SLOT="${SVCNAME#php-fpm-}"
20
if [ "${PHP_SLOT}" = "php-fpm" ] ; then
20
21
    # Getting the saved slot allows for clean stops when upgrading to a new slot
21
# OpenRC caches service dependencies at boot time (in the sysinit
22
    # This will initially be empty on start and fall through to the default
22
# runlevel), before any non-boot services are started. If we try to
23
# run eselect then, it can fail, producing a scary error message (bug
24
# 910589). For now, the error message is harmless, but we may be
25
# relying on an implementation detail to make that claim: it's
26
# important that no other parts of this script are cached when its
27
# dependencies are. Nevertheless -- for now at least -- we can avoid
28
# the error message by skipping the call to eselect in the sysinit
29
# runlevel, because our (empty) depend() function does not use
30
# PHP_SLOT in any way.
31
if [ "${PHP_SLOT}" = "php-fpm" ] && [ "${RC_RUNLEVEL}" != "sysinit" ]; then
32
    # Getting the saved slot allows for clean stops when upgrading to
33
    # a new slot This will initially be empty on start and fall
34
    # through to the default
23
    PHP_SLOT="$(service_get_value PHP_SLOT)"
35
    PHP_SLOT="$(service_get_value PHP_SLOT)"
24
    if [ -z "${PHP_SLOT}" ]; then
36
    if [ -z "${PHP_SLOT}" ]; then
25
        PHP_SLOT="$(eselect php show fpm)"
37
        PHP_SLOT="$(eselect php show fpm)"
26
- 

Return to bug 910589