From bb23ba0d1b3ab139512fd137a5e7f7241a49c2d6 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 14 Feb 2004 01:21:55 +0000 Subject: [PATCH] moved isAvoidNamespace() into main-functions file git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@893 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/functions | 7 +++++++ util-vserver/scripts/vserver.functions | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index df8129f..a4a02a2 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -237,6 +237,13 @@ function pkgInit _PKG_VSERVER=$vserver } +function isAvoidNamespace +{ + test ! -e "$1"/namespace || return 1 + test -e "$CONFDIR"/.defaults/nonamespace -o \ + -e "$1"/nonamespace +} + function getAllVservers { local i diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index a86303a..e02c0dd 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -436,13 +436,6 @@ function generateOptions _generateChcontextOptions "$1" } -function _isAvoidNamespace -{ - test ! -e "$1"/namespace || return 1 - test -e "$CONFDIR"/.defaults/nonamespace -o \ - -e "$1"/nonamespace -} - function mountVserver { local cfgdir=$1 @@ -462,7 +455,7 @@ function mountVserver $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab - _isAvoidNamespace "$cfgdir" || \ + isAvoidNamespace "$cfgdir" || \ $_SECURE_MOUNT --rbind -n "$vdir" "/" } @@ -473,7 +466,7 @@ function umountVserver is_ok=1 - _isAvoidNamespace "$cfgdir" || return 0 + isAvoidNamespace "$cfgdir" || return 0 test -e "$cfgdir"/fstab || return 0 test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" -- 1.8.1.5