X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.rpm;h=33fc3f91576ff15b7ea5312b6740691862bae420;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=9113a90310b42abfd41fc757c433f16ae4a3ca31;hpb=c9d28e9c82215a2a1eda9beff24348e571e0d671;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.rpm b/util-vserver/scripts/vserver-build.rpm index 9113a90..33fc3f9 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 @@ -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" @@ -108,3 +110,5 @@ for i; do done test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" + +base.setSuccess