From 9c502e976db94d58e94209b0726404fbd5bcd317 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 30 Jun 2005 06:13:09 +0000 Subject: [PATCH] use 'base.init' instead of 'base.initVariables' git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2108 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver-build.apt-rpm | 3 ++- util-vserver/scripts/vserver-build.debootstrap | 2 +- util-vserver/scripts/vserver-build.rpm | 2 +- util-vserver/scripts/vserver-build.skeleton | 2 +- util-vserver/scripts/vserver-build.yum | 4 +++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index f44391c..a01b0a4 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -36,7 +36,8 @@ done getDistribution -base.initVariables +base.init + pkgmgmt.initVariables rpm.initVariables apt.initVariables diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index eb77fa1..4227af8 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -29,7 +29,7 @@ function init function initVariables { - base.initVariables + base.init test -n "${mirror-unset}" || { local aux diff --git a/util-vserver/scripts/vserver-build.rpm b/util-vserver/scripts/vserver-build.rpm index 9113a90..5948f7a 100644 --- a/util-vserver/scripts/vserver-build.rpm +++ b/util-vserver/scripts/vserver-build.rpm @@ -49,7 +49,7 @@ done getDistribution "template" -base.initVariables +base.init pkgmgmt.initVariables rpm.initVariables diff --git a/util-vserver/scripts/vserver-build.skeleton b/util-vserver/scripts/vserver-build.skeleton index 05f14a1..bf6b391 100644 --- a/util-vserver/scripts/vserver-build.skeleton +++ b/util-vserver/scripts/vserver-build.skeleton @@ -37,7 +37,7 @@ done getDistribution -base.initVariables +base.init test -z "$use_pkgmgmt" || pkgmgmt.initVariables base.initFilesystem "$OPTION_FORCE" diff --git a/util-vserver/scripts/vserver-build.yum b/util-vserver/scripts/vserver-build.yum index a861bca..b1ade94 100644 --- a/util-vserver/scripts/vserver-build.yum +++ b/util-vserver/scripts/vserver-build.yum @@ -36,7 +36,7 @@ done getDistribution -base.initVariables +base.init pkgmgmt.initVariables rpm.initVariables yum.initVariables @@ -58,3 +58,5 @@ rpm.importGPGPubKeys "$SETUP_CONFDIR" \ yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" $_VYUM "$SETUP_CONFDIR" -- clean all test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" + +base.setSuccess -- 1.8.1.5