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
no longer overwrite guest's /etc/yum.conf with the version from the host
[sliceimage.git]
/
vserver-reference.init
diff --git
a/vserver-reference.init
b/vserver-reference.init
index
56c4de5
..
8845eaf
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,10
+55,13
@@
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/default" -type f -print0 | xargs -0 setattr --iunlink
+
# Build reference images for system slices
# 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
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
@@
-68,15
+71,17
@@
for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
mkdir -p "$__DEFAULT_VSERVERDIR/.vref"
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=$?
RETVAL=$?
- #
Install/update additional packages
+ #
merge the stub with the reference to get the system vserver
if [ $RETVAL -eq 0 ] ; then
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=$?
RETVAL=$?
- popd >/dev/null
fi
# Clean RPM state
fi
# Clean RPM state
@@
-98,7
+103,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