X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=ad83d46956aa86c51e64c39833d5091fc5cf48a7;hb=148d8b4df137f13bc49c77a4fa047c43f2d2d9f5;hp=b9f035808ceff302a698d07ba91f06602f36a5dc;hpb=e633a7bfb6688c8c2cdde1a8ec1715bdbee3510c;p=build.git diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index b9f03580..ad83d469 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -82,7 +82,7 @@ function package_method () { case $fcdistro in f[0-9]*|centos[0-9]*|sl[0-9]*) echo dnf ;; - wheezy|jessie|trusty|xenial|bionic|focal) + wheezy|jessie|trusty|xenial|bionic|focal|jammy) echo debootstrap ;; *) echo "Unknown package_method for distro $fcdistro" ;; @@ -100,7 +100,7 @@ function network_method () { echo ifcfg ;; wheezy|jessie|trusty|xenial|bionic) echo interfaces ;; - focal) + focal|jammy) echo systemd ;; *) echo "Unknown network_method for distro $fcdistro" ;; @@ -396,7 +396,7 @@ function debian_mirror () { case $fcdistro in wheezy|jessie) echo http://ftp2.fr.debian.org/debian/ ;; - trusty|xenial|bionic|focal) + trusty|xenial|bionic|focal|jammy) echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;; *) echo unknown distro $fcdistro; exit 1;; esac @@ -1009,7 +1009,7 @@ function main () { GUEST_IP=$(gethostbyname $GUEST_HOSTNAME) # use same NETMASK as bridge interface br0 MASKLEN=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2) - NETMASK=$(masklen_to_netmask $masklen) + NETMASK=$(masklen_to_netmask $MASKLEN) GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1) VIF_HOST="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)" fi