summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-12-28 14:59:32 +0000
committerRoy Marples <roy@marples.name>2007-12-28 14:59:32 +0000
commitc3ee088e4e295ca54a08bbb51988fc8c02c0c229 (patch)
tree51555a93a99d28e78787e16282de9614f6311fa9
parentTry and support baselayout-1 upgraders (diff)
downloaduberlord-c3ee088e4e295ca54a08bbb51988fc8c02c0c229.tar.gz
uberlord-c3ee088e4e295ca54a08bbb51988fc8c02c0c229.tar.bz2
uberlord-c3ee088e4e295ca54a08bbb51988fc8c02c0c229.zip
Fix baselayout-1 upgraders.
-rw-r--r--sys-apps/openrc/openrc-0.1.ebuild7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys-apps/openrc/openrc-0.1.ebuild b/sys-apps/openrc/openrc-0.1.ebuild
index 5cbb5d2..452a6fd 100644
--- a/sys-apps/openrc/openrc-0.1.ebuild
+++ b/sys-apps/openrc/openrc-0.1.ebuild
@@ -76,11 +76,10 @@ pkg_preinst() {
fi
# Upgrade out state for baselayout-1 users
- if [ ! -e "${ROOT}${LIBDIR}"/init.d/started \
- -a -e "${ROOT}"etc/conf.d/rc ]; then
+ if [ ! -e "${ROOT}${LIBDIR}"/init.d/started ]; then
(
- . "${ROOT}etc/conf.d/rc"
- svcdir="${svcdir:-/var/lib/init.d}"
+ [ -e "${ROOT}"etc/conf.d/rc ] && . "${ROOT}etc/conf.d/rc"
+ svcdir=${svcdir:-/var/lib/init.d}
if [ ! -d "${ROOT}${svcdir}/started" ]; then
ewarn "No state found, and no state exists"
elog "You should reboot this host"