git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, wrong quoting
[sliceimage.git]
/
vserver-reference.init
diff --git
a/vserver-reference.init
b/vserver-reference.init
index
9a20b62
..
4458a38
100755
(executable)
--- a/
vserver-reference.init
+++ b/
vserver-reference.init
@@
-35,8
+35,8
@@
exec 3>&1
exec 4>&2
# Redirect stdout and stderr to a log file
exec 4>&2
# Redirect stdout and stderr to a log file
+exec >>/var/log/vserver-reference.log
exec 2>&1
exec 2>&1
-exec &>>/var/log/vserver-reference.log
echo "--- STARTING $(date) ---" >&3 2>&4
echo "--- STARTING $(date) ---" >&3 2>&4
@@
-55,9
+55,15
@@
shopt -s nullglob
chmod 0000 "$__DEFAULT_VSERVERDIR"
setattr --barrier "$__DEFAULT_VSERVERDIR"
chmod 0000 "$__DEFAULT_VSERVERDIR"
setattr --barrier "$__DEFAULT_VSERVERDIR"
+# Set the attribute to unlink so vclone does the right thing wrt to
+# conserving space by linking and not copying unified files.
+find "$__DEFAULT_VSERVERDIR/.vref"/* -type f -print0 | xargs -0 setattr --iunlink
+
# Build reference images for system slices
# Build reference images for system slices
-for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
+# xxx if several instances of systemslices get installed, only one gets instanciated
+for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
NAME=$(basename $systemvserver .cloned)
NAME=$(basename $systemvserver .cloned)
+ DIR=$(dirname $systemvserver)
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
@@
-71,12
+77,16
@@
for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
# build the systemvserver from the one it was originally cloned from
TYPE=$(cat $systemvserver)
REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
# build the systemvserver from the one it was originally cloned from
TYPE=$(cat $systemvserver)
REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
- "$_VCLONE" "$REF"/ "$TMP"/
- RETVAL=$?
+ if [ -d "$REF" ] ; then
+ "$_VCLONE" "$REF"/ "$TMP"/
+ RETVAL=$?
+ else
+ RETVAL=1
+ fi
# merge the stub with the reference to get the system vserver
if [ $RETVAL -eq 0 ] ; then
# merge the stub with the reference to get the system vserver
if [ $RETVAL -eq 0 ] ; then
- (cd "$
__DEFAULT_VSERVERDIR/.vstub
/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
+ (cd "$
DIR
/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
RETVAL=$?
fi
RETVAL=$?
fi
@@
-88,6
+98,7
@@
for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
success >&3 2>&4
else
mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
success >&3 2>&4
else
+ rm -rf "$TMP"
failure >&3 2>&4
fi
echo >&3 2>&4
failure >&3 2>&4
fi
echo >&3 2>&4
@@
-99,7
+110,7
@@
echo -n $"Updating VServer reference images: " >&3 2>&4
VROOTS="$__DEFAULT_VSERVERDIR/.vref/* $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
# Copy configuration files from host to slices
VROOTS="$__DEFAULT_VSERVERDIR/.vref/* $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
# Copy configuration files from host to slices
-for file in /etc/hosts /etc/resolv.conf /etc/
yum.conf /etc/
planetlab/node_id \
+for file in /etc/hosts /etc/resolv.conf /etc/planetlab/node_id \
/etc/planetlab/plc_config* /etc/planetlab/php/* \
/etc/pki/rpm-gpg/* ; do
if [ -r $file ] ; then
/etc/planetlab/plc_config* /etc/planetlab/php/* \
/etc/pki/rpm-gpg/* ; do
if [ -r $file ] ; then