Second step towards multiarch myplc https://svn.planet-lab.org/ticket/214

[sliceimage.git] / vserver-reference.init

diff --git a/vserver-reference.init b/vserver-reference.init
index 9a20b62..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 >>/var/log/vserver-reference.log
 exec 2>&1
-exec &>>/var/log/vserver-reference.log
 
 echo "--- STARTING $(date) ---"  >&3 2>&4
 
@@ -55,6 +55,10 @@ shopt -s nullglob
 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
 for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
     NAME=$(basename $systemvserver .cloned)
@@ -99,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
-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