configure ifcfg in fedora vms only

[build.git] / lbuild-initvm.sh

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index c64a5a6..4b2f68e 100755 (executable)
--- 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
@@ -506,9 +509,11 @@ function debian_install () {
     set -e
     set -x
     mkdir -p $rootfs_path
-    arch=$(canonical_arch $personality)
+    arch=$(canonical_arch $personality $fcdistro)
     mirror=$(debian_mirror $fcdistro)
-    debootstrap --arch $arch $fcdistro $rootfs_path $mirror
+    # old guests have mount in /bin but this is no longer part of 
+    # the standard PATH in recent hosts
+    PATH=$PATH:/bin:/sbin debootstrap --arch $arch $fcdistro $rootfs_path $mirror
 }
 
 function debian_configure () {
@@ -537,8 +542,6 @@ function setup_lxc() {
        debootstrap)
            debian_install || { echo "failed to install debian/ubuntu root image"; exit 1 ; }
            debian_configure || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; }
-           echo "$COMMAND: no support for debootstrap-based systems - yet"
-           exit 1
            ;;
        *)
            echo "$COMMAND:: unknown package_method - exiting"
@@ -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