X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=7a9b6a8cf43305935ac53953f6fb5ec6ef6bf531;hb=fcebe8bc0f98feaa9c859b659de37febe4eb8ebf;hp=09c6ee384d3e98cfe660729554e244fa3bfc6da9;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 09c6ee3..7a9b6a8 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -292,9 +292,7 @@ function _generateInitOptions ;; (xgentoo) - INITCMD_START=( /sbin/rc default ) - INITCMD_STOP=( /sbin/rc shutdown ) - ;; + panic "init-style '$INITSTYLE' is no longer supported; please use plain instead; aborting";; (x) ;; (*) panic "Unknown init-style '$INITSTYLE'; aborting";; @@ -783,12 +781,14 @@ function umountVserver isAvoidNamespace "$cfgdir" || return 0 test -e "$cfgdir"/fstab -o \ - -e "$cfgdir"/fstab.local || return 0 + -e "$cfgdir"/fstab.local -o \ + -e "$cfgdir"/fstab.remote || return 0 test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" pushd "$vdir/" >/dev/null || return 1 - _umountVserverInternal "$cfgdir"/fstab.local || is_ok= - _umountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" || is_ok= + _umountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" || is_ok= + _umountVserverInternal "$cfgdir"/fstab.local || is_ok= + _umountVserverInternal "$cfgdir"/fstab || is_ok= popd >/dev/null || return 1 test -n "$is_ok"