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
Tagging module VserverReference -- from vserver-4.2-0 to vserver-4.2-1
[sliceimage.git]
/
vserver-reference.init
diff --git
a/vserver-reference.init
b/vserver-reference.init
index
56c4de5
..
ae177f4
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
@@
-56,9
+56,8
@@
chmod 0000 "$__DEFAULT_VSERVERDIR"
setattr --barrier "$__DEFAULT_VSERVERDIR"
# Build reference images for system slices
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
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
@@
-68,15
+67,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