From 8a97fac7807c482d0bcac1a4d8e75874d163d1e1 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 4 Feb 2004 02:48:08 +0000 Subject: [PATCH] cleanups; use 'base.' namespace git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@782 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver-build.apt-rpm | 4 ++-- util-vserver/scripts/vserver-build.functions | 4 ++-- util-vserver/scripts/vserver-build.skeleton | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index bd05fd0..4c07a3a 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -36,12 +36,12 @@ done getDistribution -initVariables +base.initVariables pkgmgmt.initVariables rpm.initVariables apt.initVariables -initFilesystem "$OPTION_FORCE" +base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem apt.initFilesystem diff --git a/util-vserver/scripts/vserver-build.functions b/util-vserver/scripts/vserver-build.functions index 8a85849..7b341f4 100644 --- a/util-vserver/scripts/vserver-build.functions +++ b/util-vserver/scripts/vserver-build.functions @@ -135,7 +135,7 @@ function getDistribution } ## Usage: initFilesystem [force] -function initFilesystem +function base.initFilesystem { test -z "$1" || _renameVserverCfg test ! -d "$VDIR" -a ! -d "$SETUP_CONFDIR" || { @@ -161,7 +161,7 @@ function initFilesystem done } -function initVariables +function base.initVariables { _setRootDir _setVserverDir diff --git a/util-vserver/scripts/vserver-build.skeleton b/util-vserver/scripts/vserver-build.skeleton index f5f5d91..4cc2626 100644 --- a/util-vserver/scripts/vserver-build.skeleton +++ b/util-vserver/scripts/vserver-build.skeleton @@ -36,10 +36,10 @@ done getDistribution -initVariables +base.initVariables test -z "$use_pkgmgmt" || pkgmgmt.initVariables -initFilesystem "$OPTION_FORCE" +base.initFilesystem "$OPTION_FORCE" test -z "$use_pkgmgmt" || pkgmgmt.initFilesystem "$OPTION_FORCE" -- 1.8.1.5