From 5c960637257da28062ab21db528f4a53e8700711 Mon Sep 17 00:00:00 2001 From: Daniel Fancsali Date: Fri, 11 Jun 2021 11:22:31 +0100 Subject: [PATCH 1/4] Fix typos; add default priority; comments in generated files --- cdist/conf/type/__apt_pin/manifest | 5 +++++ cdist/conf/type/__apt_pin/parameter/default/priority | 1 + cdist/conf/type/__apt_pin/parameter/optional | 1 + cdist/conf/type/__apt_pin/parameter/required | 1 - 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 cdist/conf/type/__apt_pin/parameter/default/priority diff --git a/cdist/conf/type/__apt_pin/manifest b/cdist/conf/type/__apt_pin/manifest index e72a8fdd..983b2b42 100755 --- a/cdist/conf/type/__apt_pin/manifest +++ b/cdist/conf/type/__apt_pin/manifest @@ -57,6 +57,11 @@ __file "/etc/apt/preferences.d/$name" \ --owner root --group root --mode 0644 \ --state "$state" \ --source - << EOF +# Created by cdist ${__type##*/} +# Do not change. Changes will be overwritten. +# + +# $name Package: $package Pin: $pin Pin-Priority: $priority diff --git a/cdist/conf/type/__apt_pin/parameter/default/priority b/cdist/conf/type/__apt_pin/parameter/default/priority new file mode 100644 index 00000000..1b79f38e --- /dev/null +++ b/cdist/conf/type/__apt_pin/parameter/default/priority @@ -0,0 +1 @@ +500 diff --git a/cdist/conf/type/__apt_pin/parameter/optional b/cdist/conf/type/__apt_pin/parameter/optional index 52f01fd2..847e703d 100644 --- a/cdist/conf/type/__apt_pin/parameter/optional +++ b/cdist/conf/type/__apt_pin/parameter/optional @@ -1,2 +1,3 @@ state package +priority diff --git a/cdist/conf/type/__apt_pin/parameter/required b/cdist/conf/type/__apt_pin/parameter/required index 4b4e9741..c8572d92 100644 --- a/cdist/conf/type/__apt_pin/parameter/required +++ b/cdist/conf/type/__apt_pin/parameter/required @@ -1,2 +1 @@ distribution -priority From d23cef6a1d9f6fab38ee6c7c0db8fb0c6cdc3787 Mon Sep 17 00:00:00 2001 From: Daniel Fancsali Date: Fri, 8 Jul 2022 16:50:54 +0100 Subject: [PATCH 2/4] Fix typo in __apt_pin docs --- cdist/conf/type/__apt_pin/man.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__apt_pin/man.rst b/cdist/conf/type/__apt_pin/man.rst index 4229c0cd..e6ec8b51 100644 --- a/cdist/conf/type/__apt_pin/man.rst +++ b/cdist/conf/type/__apt_pin/man.rst @@ -23,7 +23,7 @@ package Package name, glob or regular expression to match (multiple) packages. If not specified `__object_id` is used. priority - The priority value to assign to matching packages. Deafults to 500. (To match the default target distro's priority) + The priority value to assign to matching packages. Defaults to 500. (To match the default target distro's priority) state Will be passed to underlying `__file` type; see there for valid values and defaults. From 4f6d5281372bed9a75569bde7c0336ff17b01e50 Mon Sep 17 00:00:00 2001 From: thijs Date: Mon, 8 Aug 2022 12:23:44 +0200 Subject: [PATCH 3/4] add some funtoo support --- cdist/conf/type/__package/manifest | 2 +- cdist/conf/type/__service/explorer/service-manager | 2 ++ cdist/conf/type/__service/gencode-remote | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__package/manifest b/cdist/conf/type/__package/manifest index a453c32b..0a3c8681 100755 --- a/cdist/conf/type/__package/manifest +++ b/cdist/conf/type/__package/manifest @@ -41,7 +41,7 @@ else type="pkg_freebsd" fi ;; - gentoo) type="emerge" ;; + gentoo|funtoo) type="emerge" ;; suse) type="zypper" ;; openwrt) type="opkg" ;; openbsd) type="pkg_openbsd" ;; diff --git a/cdist/conf/type/__service/explorer/service-manager b/cdist/conf/type/__service/explorer/service-manager index 55a873fa..a89689a9 100755 --- a/cdist/conf/type/__service/explorer/service-manager +++ b/cdist/conf/type/__service/explorer/service-manager @@ -3,6 +3,8 @@ # Assume systemd if systemctl is in PATH. if [ "$(command -v systemctl)" ]; then printf "systemd" +elif [ "$(command -v rc)" ]; then + printf "openrc" else printf "unknown" fi diff --git a/cdist/conf/type/__service/gencode-remote b/cdist/conf/type/__service/gencode-remote index ac62e05f..2e940581 100755 --- a/cdist/conf/type/__service/gencode-remote +++ b/cdist/conf/type/__service/gencode-remote @@ -6,4 +6,6 @@ action="$(cat "$__object/parameter/action")" if [ "$manager" = "unknown" ]; then echo "service '$name' '$action'" +elif[ "$manager" = "openrc" ]; then + echo "rc-service $name $action" fi From a83bac3448066557ffe6ad799a13989642b01eb9 Mon Sep 17 00:00:00 2001 From: thijs Date: Mon, 8 Aug 2022 12:38:22 +0200 Subject: [PATCH 4/4] fix typo --- cdist/conf/type/__service/gencode-remote | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__service/gencode-remote b/cdist/conf/type/__service/gencode-remote index 2e940581..cc0323b0 100755 --- a/cdist/conf/type/__service/gencode-remote +++ b/cdist/conf/type/__service/gencode-remote @@ -6,6 +6,6 @@ action="$(cat "$__object/parameter/action")" if [ "$manager" = "unknown" ]; then echo "service '$name' '$action'" -elif[ "$manager" = "openrc" ]; then +elif [ "$manager" = "openrc" ]; then echo "rc-service $name $action" fi