fix functions.sh location for gentoo; create /lib/rc/sh for older stages that don...
authorBenedikt Boehm <hollow@gentoo.org>
Sun, 13 Apr 2008 10:13:47 +0000 (10:13 +0000)
committerBenedikt Boehm <hollow@gentoo.org>
Sun, 13 Apr 2008 10:13:47 +0000 (10:13 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2712 94cd875c-1c1d-0410-91d2-eb244daf1a30

distrib/gentoo/initpost
scripts/vserver-init.functions

index a61ab1b..dfcb7bd 100755 (executable)
@@ -63,6 +63,11 @@ test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
 if test "$initstyle" == "gentoo"; then
        echo ">>> Installing special init-style magic ... "
 
+       # force /lib/rc/sh even if we don't have it in older stages
+       $_CHROOT_SH mkdir /lib 2>/dev/null || :
+       $_CHROOT_SH mkdir /lib/rc 2/dev/null || :
+       $_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
+
        $_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
        $_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
        $_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
index 1f1255a..69dd368 100755 (executable)
@@ -21,7 +21,7 @@ if test -e /etc/init.d/functions; then
     _postResult() { echo; }
     lockfile=/var/lock/subsys/$LOCKFILE
 elif test -e /etc/gentoo-release; then
-    . /sbin/functions.sh
+    . /etc/init.d/functions.sh
     _beginResult() { ebegin "$@"; }
     _postResult() { :; }
     success() { eend 0; }