We should always mount $RC_SVCDIR unless in a vserver or it's already mounted.
This commit is contained in:
parent
415fe87d8c
commit
6bb44be2a3
@ -1,19 +1,20 @@
|
|||||||
# Copyright 2007-2008 Roy Marples <roy@marples.name>
|
# Copyright 2007-2008 Roy Marples <roy@marples.name>
|
||||||
# All rights reserved. Released under the 2-clause BSD license.
|
# All rights reserved. Released under the 2-clause BSD license.
|
||||||
|
|
||||||
retval=0
|
# mount $RC_SVCDIR as something we can write to if it's not rw
|
||||||
|
|
||||||
# mount $svcdir as something we can write to if it's not rw
|
|
||||||
# On vservers, / is always rw at this point, so we need to clean out
|
# On vservers, / is always rw at this point, so we need to clean out
|
||||||
# the old service state data
|
# the old service state data
|
||||||
RC_SVCDIR=${RC_SVCDIR:-/@LIB@/rc/init.d}
|
RC_SVCDIR=${RC_SVCDIR:-/@LIB@/rc/init.d}
|
||||||
if [ "${RC_SVCDIR}" != "/" ] && mkdir "${RC_SVCDIR}/.test.$$" 2>/dev/null; then
|
case "$(rc --sys)" in
|
||||||
rmdir "${RC_SVCDIR}/.test.$$"
|
OPENVZ|VSERVER) rm -rf "${RC_SVCDIR}"/*;;
|
||||||
|
*) if mountinfo --quiet "${RC_SVCDIR}"; then
|
||||||
rm -rf "${RC_SVCDIR}"/*
|
rm -rf "${RC_SVCDIR}"/*
|
||||||
else
|
else
|
||||||
mount_svcdir
|
mount_svcdir
|
||||||
retval=$?
|
fi
|
||||||
fi
|
;;
|
||||||
|
esac
|
||||||
|
retval=$?
|
||||||
|
|
||||||
if [ -e "${RC_LIBDIR}"/cache/deptree ]; then
|
if [ -e "${RC_LIBDIR}"/cache/deptree ]; then
|
||||||
cp -p "${RC_LIBDIR}"/cache/* "${RC_SVCDIR}" 2>/dev/null
|
cp -p "${RC_LIBDIR}"/cache/* "${RC_SVCDIR}" 2>/dev/null
|
||||||
|
Loading…
Reference in New Issue
Block a user