From 3c1cf31056221b361b0fb53dc96879cfceb0b440 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 25 Jul 2005 15:40:22 +0000 Subject: [PATCH] call rpm.sanityCheck() git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2162 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver-build.apt-rpm | 3 +++ util-vserver/scripts/vserver-build.rpm | 4 +++- util-vserver/scripts/vserver-build.yum | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index 340b37c..b40f9bf 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -42,6 +42,9 @@ pkgmgmt.initVariables rpm.initVariables apt.initVariables +rpm.sanityCheck + + base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem diff --git a/util-vserver/scripts/vserver-build.rpm b/util-vserver/scripts/vserver-build.rpm index d509a7c..33fc3f9 100644 --- a/util-vserver/scripts/vserver-build.rpm +++ b/util-vserver/scripts/vserver-build.rpm @@ -68,6 +68,8 @@ test "$OPTION_DEBUG" -lt 2 || rpm_dflt_opts=( "${rpm_dflt_opts[@]}" -v ) test "$OPTION_DEBUG" -lt 3 || rpm_dflt_opts=( "${rpm_dflt_opts[@]}" -v ) test -n "$OPTION_SILENT" || rpm_dflt_opts=( "${rpm_dflt_opts[@]}" -vh ) +rpm.sanityCheck + ###### init the filesystem @@ -75,6 +77,7 @@ base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem + setup_writeOption "$VSERVER_NAME" setup_writeInitialFstab @@ -87,7 +90,6 @@ manifest=$($_MKTEMP /tmp/vserver-build.rpm.manifest.XXXXXX) trap "rm -rf $tmpdir $manifest" EXIT cd "$tmpdir" - ###### do the real work test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" diff --git a/util-vserver/scripts/vserver-build.yum b/util-vserver/scripts/vserver-build.yum index b1ade94..8fccd40 100644 --- a/util-vserver/scripts/vserver-build.yum +++ b/util-vserver/scripts/vserver-build.yum @@ -41,6 +41,9 @@ pkgmgmt.initVariables rpm.initVariables yum.initVariables +rpm.sanityCheck + + base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem -- 1.8.1.5