git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd58c0c
)
skip fedora_configure_yum for image (rootfs) provided VMs.
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Thu, 20 Feb 2014 10:23:20 +0000
(11:23 +0100)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Thu, 20 Feb 2014 10:23:20 +0000
(11:23 +0100)
Minor fix
lbuild-initvm.sh
patch
|
blob
|
history
diff --git
a/lbuild-initvm.sh
b/lbuild-initvm.sh
index
b9c0109
..
0b09cf7
100755
(executable)
--- a/
lbuild-initvm.sh
+++ b/
lbuild-initvm.sh
@@
-375,7
+375,7
@@
EOF
guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST
( [ -n "$BUILD_MODE" ] && write_guest_ifcfg_build || write_guest_ifcfg_test ) > $guest_ifcfg
guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST
( [ -n "$BUILD_MODE" ] && write_guest_ifcfg_build || write_guest_ifcfg_test ) > $guest_ifcfg
- fedora_configure_yum $lxc $fcdistro $pldistro
+
[ -z "$IMAGE" ] &&
fedora_configure_yum $lxc $fcdistro $pldistro
return 0
}
return 0
}
@@
-912,7
+912,7
@@
function main () {
if [ -n "$IMAGE" ] ; then
[ ! -d "$IMAGE" ] && \
{ echo "$IMAGE rootfs folder does not exist - exiting" ; exit 1 ; }
if [ -n "$IMAGE" ] ; then
[ ! -d "$IMAGE" ] && \
{ echo "$IMAGE rootfs folder does not exist - exiting" ; exit 1 ; }
-
cp -r $IMAGE/*
$lxc_root/
+
rsync -a $IMAGE/
$lxc_root/
fi
fi