From 2d25e6a9067e16d6950667bea28e80642dfa6fcd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 22 Jan 2014 14:01:54 +0100 Subject: [PATCH] configure ifcfg in fedora vms only --- lbuild-initvm.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 57007242..4b2f68e0 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -392,6 +392,9 @@ EOF fedora_configure_systemd fi + guest_ifcfg=${rootfs_path}/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 return 0 @@ -559,14 +562,7 @@ function setup_lxc() { cat /root/.ssh/id_rsa.pub >> $rootfs_path/root/.ssh/authorized_keys config_xml=$config_path/"lxc.xml" - guest_ifcfg=${rootfs_path}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST - if [ -n "$BUILD_MODE" ] ; then - write_lxc_xml_build $lxc > $config_xml - write_guest_ifcfg_build > $guest_ifcfg - else - write_lxc_xml_test $lxc > $config_xml - write_guest_ifcfg_test > $guest_ifcfg - fi + [ -n "$BUILD_MODE" ] && write_lxc_xml_build $lxc || write_lxc_xml_test $lxc > $config_xml # define lxc container for libvirt virsh -c lxc:/// define $config_xml -- 2.43.0