From 27471a4a82ac29c1a1f3062178a509660d55e732 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 2 Aug 2024 12:05:37 +0200
Subject: [PATCH 1/4] [__timezone] add support for openwrt

---
 cdist/conf/type/__timezone/gencode-remote | 9 +++++++++
 cdist/conf/type/__timezone/manifest       | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cdist/conf/type/__timezone/gencode-remote b/cdist/conf/type/__timezone/gencode-remote
index b685c990..d8612986 100755
--- a/cdist/conf/type/__timezone/gencode-remote
+++ b/cdist/conf/type/__timezone/gencode-remote
@@ -34,3 +34,12 @@ case "$os" in
       echo "echo \"$timezone_should\" > /etc/timezone"
    ;;
 esac
+
+case "$os" in
+    openwrt)
+        cat <<EOF
+			uci set system.@system[0].timezone="$timezone_should"
+			uci commit
+EOF
+   ;;
+esac
diff --git a/cdist/conf/type/__timezone/manifest b/cdist/conf/type/__timezone/manifest
index 0eb7fb9c..307bec04 100755
--- a/cdist/conf/type/__timezone/manifest
+++ b/cdist/conf/type/__timezone/manifest
@@ -53,7 +53,10 @@ case "$os" in
                 --file /etc/sysconfig/clock \
                 --delimiter '=' \
                 --value "\"$timezone\""
-    ;;
+        ;;
+    openwrt)
+        : # Uses gencode-remote
+        ;;
     *)
         echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
         echo "Please contribute an implementation for it if you can." >&2

From 912eef6b5dee8fcd3e8b12f78a08572f0c603487 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 2 Aug 2024 12:07:22 +0200
Subject: [PATCH 2/4] ++changelog

---
 docs/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index 4e9a8a6d..fa741365 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,6 +1,9 @@
 Changelog
 ---------
 
+next:
+	* Type __timezone: Add support for OpenWRT (Nico Schottelius)
+
 7.0.1:
 	* Core: Remove double definition of scan parser (Nico Schottelius)
 	* Type __apt_mark: Narrow down grep for hold packages (marcoduif)

From 3d2e3f4a2eb9353457fb49fb538305b2f597cdfa Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 5 Jun 2026 12:47:03 +0200
Subject: [PATCH 3/4] [type __jail] do better version selection on freebsd > 9

Contributed by Shannon Prickett
---
 cdist/conf/type/__jail/manifest | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index fad6a3a1..d73c3cbf 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -1,6 +1,8 @@
 #!/bin/sh -e
 #
 # 2012 Jake Guffey (jake.guffey at eprotex.com)
+# 2026 Shannon Prickett
+# 2026 Nico Schottelius
 #
 # This file is part of cdist.
 #
@@ -43,7 +45,7 @@ for property in *; do
 	set -- "$@" "--$property" "$(cat "$property")"
 done
 
-if grep -q '^10\.' "$(cat "$__global/explorer/os_version")" ; then   # Version is 10.x
+if grep -q '^[[:digit:]]\{2,\}\.' "$__global/explorer/os_version" ; then # Version > 9.x
    __jail_freebsd10 "$@"
 else
    __jail_freebsd9 "$@"
@@ -51,4 +53,3 @@ fi
 
 # Debug
 #set +x
-

From 7ae9e4658e421348b25dc3cea1b9d3dde02db746 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 5 Jun 2026 12:48:06 +0200
Subject: [PATCH 4/4] ++changelog

---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index fa741365..db6d7fc6 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -3,6 +3,7 @@ Changelog
 
 next:
 	* Type __timezone: Add support for OpenWRT (Nico Schottelius)
+	* Type __jail: Add support for FreeBSD > 10 (Shannon Prickett)
 
 7.0.1:
 	* Core: Remove double definition of scan parser (Nico Schottelius)