X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver-build.rpm;h=2daef464da39b4f02e9054e872311278a2211900;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=25a28622685782d251c1f157087f7afb4fb34332;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git

diff --git a/scripts/vserver-build.rpm b/scripts/vserver-build.rpm
index 25a2862..2daef46 100644
--- a/scripts/vserver-build.rpm
+++ b/scripts/vserver-build.rpm
@@ -1,4 +1,4 @@
-# $Id: vserver-build.rpm,v 1.6 2005/07/03 13:17:38 ensc Exp $	--*- sh -*--
+# $Id: vserver-build.rpm 2263 2006-01-22 12:24:25Z ensc $	--*- sh -*--
 
 # Copyright (C) 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -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
 
@@ -82,12 +85,11 @@ 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 /var/tmp/vserver-build.rpm.XXXXXX)
-manifest=$($_MKTEMP /tmp/vserver-build.rpm.manifest.XXXXXX)
+tmpdir=$($_MKTEMPDIR -p /var/tmp vserver-build.rpm.XXXXXX)
+manifest=$($_MKTEMP 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"