X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fpkgmgmt;fp=scripts%2Fpkgmgmt;h=c174991c7718cfefff4336b30abb3567f7b32453;hb=4415d2a7377be61789eb5a6e35222962cbe7a146;hp=da52508247577dc2562d1bdb747c459a4b1c5a10;hpb=b0a62d195efca12c5cb9e7c0b3bea3be2cd57fc9;p=util-vserver.git diff --git a/scripts/pkgmgmt b/scripts/pkgmgmt index da52508..c174991 100755 --- a/scripts/pkgmgmt +++ b/scripts/pkgmgmt @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: pkgmgmt 2518 2007-03-18 22:15:07Z dhozac $ +# $Id: pkgmgmt 2599 2007-08-26 21:30:50Z dhozac $ # Copyright (C) 2004,2005 Enrico Scholz # @@ -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"