# VServer definitions
. /usr/lib/util-vserver/util-vserver-vars
+# Save stdout and stderr
+exec 3>&1
+exec 4>&2
+
+# Redirect stdout and stderr to a log file
+exec >>/var/log/vserver-reference.log
+exec 2>&1
+
+echo "--- STARTING $(date) ---" >&3 2>&4
+
# Parse PLC configuration
if [ -r /etc/planetlab/plc_config ] ; then
. /etc/planetlab/plc_config
PLC_BOOT_HOST="boot.planet-lab.org"
fi
-# Save stdout and stderr
-exec 3>&1
-exec 4>&2
-
-# Redirect stdout and stderr to a log file
-exec 2>&1
-exec &>/var/log/vserver-reference.log
-
shopt -s nullglob
# Make sure the barrier bit is set
setattr --barrier "$__DEFAULT_VSERVERDIR"
# Build reference images for system slices
-# XXX Use Stork?
-for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
- NAME=$(basename $lst .lst)
+for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
+ NAME=$(basename $systemvserver .cloned)
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
mkdir -p "$__DEFAULT_VSERVERDIR/.vref"
- "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/.vref/default" "$TMP"
+
+ # build the systemvserver from the one it was originally cloned from
+ TYPE=$(cat $systemvserver)
+ REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
+ "$_VCLONE" "$REF"/ "$TMP"/
RETVAL=$?
- # Install/update additional packages
+ # merge the stub with the reference to get the system vserver
if [ $RETVAL -eq 0 ] ; then
- pushd "$__DEFAULT_VSERVERDIR/system-packages" >/dev/null
- xargs rpm --root "$TMP" --install < "$NAME.lst"
+ (cd "$__DEFAULT_VSERVERDIR/.vstub/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
RETVAL=$?
- popd >/dev/null
fi
# Clean RPM state
done
success >&3 2>&4
+echo "--- DONE $(date) ---" >&3 2>&4
echo >&3 2>&4
exit 0