From d030fcfca2ed36c49ce41c2539a1a279bc13142d Mon Sep 17 00:00:00 2001
From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 20 Feb 2014 11:23:20 +0100
Subject: [PATCH] skip fedora_configure_yum for image (rootfs) provided VMs.
Minor fix
---
lbuild-initvm.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index b9c0109f..0b09cf7f 100755
--- 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
- fedora_configure_yum $lxc $fcdistro $pldistro
+ [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro
return 0
}
@@ -912,7 +912,7 @@ function main () {
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
--
2.47.0