From 18d87a912ecd1801cd0df8b4df83c92520dc47f1 Mon Sep 17 00:00:00 2001
From: Brett Holman <brett.holman@canonical.com>
Date: Thu, 20 Jul 2023 11:03:57 -0600
Subject: [PATCH] Keep old groups on ubuntu jammy

---
 debian/changelog                       |  8 ++++++++
 debian/patches/retain-old-groups.patch | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 debian/patches/retain-old-groups.patch

diff --git a/debian/changelog b/debian/changelog
index f55dcbcc74d..fee68eef23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cloud-init (23.2-0ubuntu0~22.04.1ubuntu2) UNRELEASED; urgency=medium
+
+  * d/patches/retain-old-groups.patch:
+    - Retain original groups in default group for ubuntu.
+      Mantic removed unneeded groups.
+
+ -- Brett Holman <brett.holman@canonical.com>  Thu, 20 Jul 2023 15:07:36 -0600
+
 cloud-init (23.2-0ubuntu0~22.04.1) jammy; urgency=medium
 
   * d/control: Remove pep8 dependency. It is no longer used.
diff --git a/debian/patches/retain-old-groups.patch b/debian/patches/retain-old-groups.patch
new file mode 100644
index 00000000000..be8f6fd0d43
--- /dev/null
+++ b/debian/patches/retain-old-groups.patch
@@ -0,0 +1,13 @@
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index e496c62c3..a4a4671a6 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -206,7 +206,7 @@ system_info:
+      name: ubuntu
+      lock_passwd: True
+      gecos: Ubuntu
+-     groups: [adm, cdrom, dip, lxd, sudo]
++     groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
+      sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+      shell: /bin/bash
+ {# SRU_BLOCKER: do not ship network renderers on Xenial, Bionic or Eoan #}