bugfix unterminated quote. fixes #363

++changelog
Merge pull request 'Make sure flag is followed by end of line or space.' (#349 ) from mark/cdist:machine_type into master
4 changed files with 7 additions and 3 deletions
--- a/cdist/conf/explorer/machine_type
+++ b/cdist/conf/explorer/machine_type
@ -515,7 +515,7 @@ check_vm_arch_specific() {
 				&& return 0
 			fi
 			if has_cpuinfo \
-				&& grep -q -i -e '^flags.*:.*\(hypervisor\|vmm\)' /proc/cpuinfo
+				&& grep -q -i -e '^flags.*:.*\(hypervisor\|vmm\)\( \|$\)' /proc/cpuinfo
 			then
 				return 0
 			fi
--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@ -82,6 +82,7 @@ in
            # ceres versions don't have a number, so we decode by codename:
            case ${devuan_version}
            in
+               (daedalus/ceres) echo 4.99 ;;
               (chimaera/ceres) echo 3.99 ;;
               (beowulf/ceres) echo 2.99 ;;
               (ascii/ceres) echo 1.99 ;;
--- a/cdist/conf/type/__letsencrypt_cert/manifest
+++ b/cdist/conf/type/__letsencrypt_cert/manifest
@ -85,7 +85,7 @@ if [ -z "${certbot_fullpath}" ]; then
 			esac
 		;;
 		freebsd)
-			__package py37-certbot
+			__package py39-certbot
 			certbot_fullpath="/usr/local/bin/certbot"
 		;;
 		ubuntu)
--- a/docs/changelog
+++ b/docs/changelog
@ -2,9 +2,12 @@ Changelog
 ---------

 7.0.1:
+	* Core: Remove double definition of scan parser (Nico Schottelius)
 	* Type __apt_mark: Narrow down grep for hold packages (marcoduif)
 	* Type __apt_source: Set required options variable (Mark Verboom)
-	* Core: Remove double definition of scan parser (Nico Schottelius)
+	* Type __letsencrypt_cert: Update python version (Michelle)
+	* Explorer os_version: Add support for Daedalus (Michelle)
+	* Explorer machine_type: Correct incorrect VMM matching (Mark Verboom)

 7.0.0: 2022-07-31
 	* Explorer machine_type: Rewrite (Dennis Camera)
Author	SHA1	Message	Date
pedro	e139397529	bugfix unterminated quote. fixes #363	3 months ago
Nico Schottelius	7dd2d1025a	++changelog	4 months ago
nico	513a8ae177	Merge pull request 'Make sure flag is followed by end of line or space.' (#349 ) from mark/cdist:machine_type into master Reviewed-on: ungleich-public/cdist#349	4 months ago
nico	2a2f91959e	Merge pull request 'Updated the python version of cerbot freebsd' (#359 ) from CamilionEU/cdist:cerbot-freebsd into master Reviewed-on: ungleich-public/cdist#359	4 months ago
nico	fcf76cdb2c	Merge pull request 'Added support for Devuan Daedalus' (#358 ) from CamilionEU/cdist:explorer-devuan-update into master Reviewed-on: ungleich-public/cdist#358	4 months ago
Michelle	1450861e26	Updated the python version of cerbot freebsd The package referenced for cerbot to be install in the FreeBSD platform used python 3.7 package, updated to python 3.9	4 months ago
Michelle	08a6b467fa	Added support for Devuan Daedalus Added one line that allows cdist to support Devuan Daedelus version	4 months ago
Mark Verboom	c85184dcb4	Make sure flag is followed by end of line or space.	9 months ago