X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=aa714608e9a82cffa144c0bbd75451b998d6495f;hb=a666e2c378c32ff0c002833a7fc151aec318aa55;hp=b3c8f2714703518f55e2f8c2ed72742ab37d56a5;hpb=2fe4f58675d0658f284f004a2ce3bf5cc42c5502;p=build.git diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index b3c8f271..aa714608 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -30,7 +30,7 @@ function lxcroot () { # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s -DEFAULT_FCDISTRO=f24 +DEFAULT_FCDISTRO=f27 DEFAULT_PLDISTRO=lxc DEFAULT_PERSONALITY=linux64 DEFAULT_MEMORY=3072 @@ -655,11 +655,15 @@ function devel_or_test_tools () { case "$pkg_method" in yum) # --allowerasing required starting with fedora24 - dnf=$(chroot ${lxc_root} $personality type -p dnf) - if [ -n "$dnf" ]; then + # + has_dnf="" + chroot ${lxc_root} $personality dnf --version && has_dnf=true + if [ -n "$has_dnf" ]; then + echo "container has dnf - invoking with --allowerasing" pkg_installer="dnf -y install --allowerasing" grp_installer="dnf -y groupinstall --allowerasing" else + echo "container has only yum" pkg_installer="yum -y install" grp_installer="yum -y groupinstall" fi