git://git.onelab.eu
/
util-vserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f5b003
)
- don't build images in .vtmp, vcached blows this away every 15 minutes
author
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 2 Sep 2005 20:00:39 +0000
(20:00 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 2 Sep 2005 20:00:39 +0000
(20:00 +0000)
scripts/vuseradd
patch
|
blob
|
history
diff --git
a/scripts/vuseradd
b/scripts/vuseradd
index
5fffe4d
..
8023aa6
100755
(executable)
--- a/
scripts/vuseradd
+++ b/
scripts/vuseradd
@@
-4,7
+4,7
@@
#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
-# $Id: vuseradd,v 1.2
2 2005/07/28 21:30:07 smuir
Exp $
+# $Id: vuseradd,v 1.2
3 2005/08/21 21:41:03 mlhuang
Exp $
#
: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
#
: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@
-56,11
+56,11
@@
if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
done
# build vserver
if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
done
# build vserver
if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
- # build i
mage in .vtmp
- TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.
vtmp/
$NAME.XXXXXX")
+ # build i
n temporary directory
+ TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.$NAME.XXXXXX")
"$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
RETVAL=$?
"$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
RETVAL=$?
- # move it to
.vcache
when complete
+ # move it to
its permanent location
when complete
if [ $RETVAL -ne 0 ] ; then
echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
rm -rf "$TMP" $__CONFDIR/$NAME.conf $__PKGSTATEDIR/$NAME.ctx
if [ $RETVAL -ne 0 ] ; then
echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
rm -rf "$TMP" $__CONFDIR/$NAME.conf $__PKGSTATEDIR/$NAME.ctx