From 3d2e3f4a2eb9353457fb49fb538305b2f597cdfa Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 5 Jun 2026 12:47:03 +0200 Subject: [PATCH] [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 -