From bc9d1dc960c321e130ef94e2521cef07bde0a829 Mon Sep 17 00:00:00 2001
From: Patrik Holmqvist <pahol@sunet.se>
Date: Wed, 19 Jun 2024 14:02:24 +0200
Subject: [PATCH] Use upstream puppet modules for ubuntu24+.

This is how we do it in modern debian so it
makes sense to do it on modern ubuntu as well.
---
 global/pre-tasks.d/030puppet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet
index c431f0a..e6e5364 100755
--- a/global/pre-tasks.d/030puppet
+++ b/global/pre-tasks.d/030puppet
@@ -13,7 +13,7 @@ if ! test -f "${stamp}" -a -f /usr/bin/puppet; then
     . /etc/os-release
 
     # Note: in posix shell, string comparison is done with a single =
-    if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" -ge 12 ]; then
+    if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" -ge 12 ] || ([ "${ID}" = "ubuntu" ] && $(dpkg --compare-versions ${VERSION_ID} ge 24.04)) ; then
       apt-get -y install \
           cron \
           puppet-module-camptocamp-augeas \