backing out to version 208 of util-vserver

[util-vserver.git] / scripts / vserver-build.rpm

diff --git a/scripts/vserver-build.rpm b/scripts/vserver-build.rpm
index 2daef46..25a2862 100644 (file)
--- a/scripts/vserver-build.rpm
+++ b/scripts/vserver-build.rpm
@@ -1,4 +1,4 @@
-# $Id: vserver-build.rpm 2263 2006-01-22 12:24:25Z ensc $      --*- sh -*--
+# $Id: vserver-build.rpm,v 1.6 2005/07/03 13:17:38 ensc Exp $  --*- sh -*--
 
 # Copyright (C) 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -68,8 +68,6 @@ 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
 
@@ -77,7 +75,6 @@ base.initFilesystem    "$OPTION_FORCE"
 pkgmgmt.initFilesystem "$OPTION_FORCE"
 rpm.initFilesystem
 
-
 setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
@@ -85,11 +82,12 @@ setup_writeInitialFstab
 # when basedir is a non-local location, rpm will download it into the
 # current directory. Therefore, create and go into a temporay directory
 # before doing the operations.
-tmpdir=$($_MKTEMPDIR -p /var/tmp vserver-build.rpm.XXXXXX)
-manifest=$($_MKTEMP vserver-build.rpm.manifest.XXXXXX)
+tmpdir=$($_MKTEMPDIR /var/tmp/vserver-build.rpm.XXXXXX)
+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"