X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fpkgmgmt;h=d38c192f3df0badf24f0f52e3610f64697e3baf0;hb=e5d96f93d0de60ca5fe2f30c09aef449e39e3e89;hp=c32434a0acc858e4da171acbf679a98124539b87;hpb=846d3ac42cb8a99f1e5b21eecc772826889caae0;p=util-vserver.git diff --git a/scripts/pkgmgmt b/scripts/pkgmgmt index c32434a..d38c192 100755 --- a/scripts/pkgmgmt +++ b/scripts/pkgmgmt @@ -160,9 +160,9 @@ function _mountFilesystems() } test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" - _mountFilesystemsInternal "$cfgdir"/fstab || return 1 - _mountFilesystemsInternal "$cfgdir"/fstab.local || return 1 - _mountFilesystemsInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" || return 1 + _mountFilesystemsInternal "$cfgdir"/fstab || return 1 + _mountFilesystemsInternal "$cfgdir"/fstab.local || return 1 + _mountFilesystemsInternal "$cfgdir"/fstab.remote "${CHBIND_CMD[@]}" || return 1 } function _umountFilesystems() @@ -177,9 +177,9 @@ function _umountFilesystems() test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" pushd "$vdir/" >/dev/null || return 1 - _umountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" || is_ok= - _umountVserverInternal "$cfgdir"/fstab.local || is_ok= - _umountVserverInternal "$cfgdir"/fstab || is_ok= + _umountVserverInternal "$cfgdir"/fstab.remote "${CHBIND_CMD[@]}" || is_ok= + _umountVserverInternal "$cfgdir"/fstab.local || is_ok= + _umountVserverInternal "$cfgdir"/fstab || is_ok= popd >/dev/null || return 1 test -n "$is_ok" @@ -399,7 +399,7 @@ function processVserver() return 1 } >&2 - _setVserverDir + _setVserverDir "$vserver" _setVserverName _setVserverDirName pkgmgmt.initVariables