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
force the overwrite of /etc/yum.conf from /etc/yum.conf.rpmnew file
[sliceimage.git]
/
vserver-reference.init
diff --git
a/vserver-reference.init
b/vserver-reference.init
index
ae177f4
..
8845eaf
100755
(executable)
--- a/
vserver-reference.init
+++ b/
vserver-reference.init
@@
-55,6
+55,10
@@
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
for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
NAME=$(basename $systemvserver .cloned)
# 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
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