9 files changed, 37 insertions, 14 deletions
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml
index 7cfee337..c98212ea 100644
--- a/.github/workflows/trigger_rebuild_packages.yml
+++ b/.github/workflows/trigger_rebuild_packages.yml
@@ -31,6 +31,8 @@ jobs:
               - 'scripts/package-build/aws-gwlbtun/**'
             blackbox_exporter:
               - 'scripts/package-build/blackbox_exporter/**'
+            bash-completion:
+              - 'scripts/package-build/bash-completion/**'
             ddclient:
               - 'scripts/package-build/ddclient/**'
             dropbear:
@@ -51,6 +53,8 @@ jobs:
               - 'scripts/package-build/kea/**'
             keepalived:
               - 'scripts/package-build/keepalived/**'
+            libnss-mapuser:
+              - 'scripts/package-build/libnss-mapuser/**'
             libpam-radius-auth:
               - 'scripts/package-build/libpam-radius-auth/**'
             linux-kernel:
@@ -121,6 +125,10 @@ jobs:
             trigger_build "aws-gwlbtun"
           fi
 
+          if [ "${{ steps.changes.outputs.bash-completion }}" == "true" ]; then
+            trigger_build "bash-completion"
+          fi
+
           if [ "${{ steps.changes.outputs.ddclient }}" == "true" ]; then
             trigger_build "ddclient"
           fi
@@ -161,6 +169,10 @@ jobs:
             trigger_build "keepalived"
           fi
 
+          if [ "${{ steps.changes.outputs.libnss-mapuser }}" == "true" ]; then
+            trigger_build "libnss-mapuser"
+          fi
+
           if [ "${{ steps.changes.outputs.libpam-radius-auth }}" == "true" ]; then
             trigger_build "libpam-radius-auth"
           fi
diff --git a/data/live-build-config/archives/buster.list.chroot b/data/live-build-config/archives/buster.list.chroot
deleted file mode 100644
index 06eb2dab..00000000
--- a/data/live-build-config/archives/buster.list.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://deb.debian.org/debian/ buster main non-free
-deb http://deb.debian.org/debian/ buster-updates main non-free
-deb http://security.debian.org/debian-security buster/updates main non-free
diff --git a/data/live-build-config/archives/buster.pref.chroot b/data/live-build-config/archives/buster.pref.chroot
deleted file mode 100644
index 8caa1e6d..00000000
--- a/data/live-build-config/archives/buster.pref.chroot
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: bash
-Pin: release n=buster
-Pin-Priority: 600
-
-Package: bash-completion
-Pin: release n=buster
-Pin-Priority: 600
-
-Package: *
-Pin: release n=buster
-Pin-Priority: -10
diff --git a/scripts/package-build/bash-completion/.gitignore b/scripts/package-build/bash-completion/.gitignore
new file mode 100644
index 00000000..73e9d517
--- /dev/null
+++ b/scripts/package-build/bash-completion/.gitignore
@@ -0,0 +1 @@
+/bash-completion/
diff --git a/scripts/package-build/bash-completion/build.py b/scripts/package-build/bash-completion/build.py
new file mode 120000
index 00000000..3c76af73
--- /dev/null
+++ b/scripts/package-build/bash-completion/build.py
@@ -0,0 +1 @@
+../build.py
+\ No newline at end of file
diff --git a/scripts/package-build/bash-completion/package.toml b/scripts/package-build/bash-completion/package.toml
new file mode 100644
index 00000000..49667429
--- /dev/null
+++ b/scripts/package-build/bash-completion/package.toml
@@ -0,0 +1,12 @@
+# VyOS CLI requires an older version of bash-completion to work
+
+[[packages]]
+name = "bash-completion"
+commit_id = "debian/2.8-6"
+scm_url = "https://salsa.debian.org/debian/bash-completion"
+
+build_cmd = """
+
+# Build deb
+dpkg-buildpackage -b -us -uc
+"""
diff --git a/scripts/package-build/libnss-mapuser/.gitignore b/scripts/package-build/libnss-mapuser/.gitignore
new file mode 100644
index 00000000..15657c19
--- /dev/null
+++ b/scripts/package-build/libnss-mapuser/.gitignore
@@ -0,0 +1 @@
+/libnss-mapuser/
diff --git a/scripts/package-build/libnss-mapuser/build.py b/scripts/package-build/libnss-mapuser/build.py
new file mode 120000
index 00000000..3c76af73
--- /dev/null
+++ b/scripts/package-build/libnss-mapuser/build.py
@@ -0,0 +1 @@
+../build.py
+\ No newline at end of file
diff --git a/scripts/package-build/libnss-mapuser/package.toml b/scripts/package-build/libnss-mapuser/package.toml
new file mode 100644
index 00000000..20ff65b4
--- /dev/null
+++ b/scripts/package-build/libnss-mapuser/package.toml
@@ -0,0 +1,9 @@
+[[packages]]
+name = "libnss-mapuser"
+commit_id = "current"
+scm_url = "https://github.com/vyos/libnss-mapuser.git"
+
+[dependencies]
+packages = [
+    "libaudit-dev"
+]