From 5097e161a9e86540782b27016d9fdc6730b84777 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 30 Jun 2022 11:37:24 +0200
Subject: [PATCH] accomodate for ubuntu-22.04 aka jammy

---
 build.common     | 2 +-
 lbuild-initvm.sh | 6 +++---
 pkgs.py          | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.common b/build.common
index 4535cf9e..e34434c1 100644
--- a/build.common
+++ b/build.common
@@ -65,7 +65,7 @@ function pl_getReleaseName () {
         [Ss]L*)
             releasename=sl$release
             ;;
-        wheezy|jessie|trusty|xenial|bionic|focal)
+        wheezy|jessie|trusty|xenial|bionic|focal|jammy)
             releasename=$distro
             ;;
         *)
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index b8615d75..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
diff --git a/pkgs.py b/pkgs.py
index 96b6db7a..bc8195a6 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -40,8 +40,8 @@ default_fcdistro = 'f35'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
-    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 
-    'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27', 
+    'f8', 'f10', 'f12', 'f14', 'f16', 'f18',
+    'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27',
     # these ones are still relevant;
     # f32 is mentioned to be able to use create-vms with that distro
     # as we're running into issues to build a minimal f33 from a f29 host
@@ -55,6 +55,7 @@ known_fcdistros = [
     'xenial',  # 16.04 LTS
     'bionic',  # 18.04 LTS
     'focal',   # 20.04 LTS
+    'jammy',   # 22.04 LTS
 ]
 default_pldistro = 'onelab'
 
-- 
2.43.0