From b45f47acf234581a91c0c602dde9ce2bc2d9e2c9 Mon Sep 17 00:00:00 2001
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Thu, 22 Sep 2022 11:00:29 +0200
Subject: [PATCH] reserved-usernames: build using latest version from
 user-setup.git

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
---
 snapcraft.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index cfb11657..78abc3ee 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -159,9 +159,15 @@ parts:
       echo "get passwd/user-default-groups" | \
         debconf-communicate user-setup | \
         cut -d ' ' -f 2- > $SNAPCRAFT_PART_INSTALL/users-and-groups
-      cp /usr/lib/user-setup/reserved-usernames $SNAPCRAFT_PART_INSTALL/
     stage:
       - users-and-groups
+  user-setup:
+    plugin: nil
+    source: https://git.launchpad.net/ubuntu/+source/user-setup
+    source-type: git
+    override-build:
+      cp -a reserved-usernames $SNAPCRAFT_PART_INSTALL/
+    stage:
       - reserved-usernames
   keyboard-data:
     plugin: nil