From 9d4c0331a9fd4772162c8ff98cdcae91040c94ac Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Fri, 15 Jun 2018 12:54:58 +0200
Subject: [PATCH] __sysctl: support sysctl.d

---
 cdist/conf/type/__sysctl/explorer/conf-path | 25 +++++++++++++++++++++
 cdist/conf/type/__sysctl/manifest           |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 cdist/conf/type/__sysctl/explorer/conf-path

diff --git a/cdist/conf/type/__sysctl/explorer/conf-path b/cdist/conf/type/__sysctl/explorer/conf-path
new file mode 100755
index 00000000..ba35c4c6
--- /dev/null
+++ b/cdist/conf/type/__sysctl/explorer/conf-path
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# 2018 Darko Poljak (darko.poljak at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
+if [ -d "/etc/sysctl.d" ]; then
+    echo "/etc/sysctl.d/99-Z-sysctl-cdist.conf";
+else
+    echo "/etc/sysctl.conf";
+fi
diff --git a/cdist/conf/type/__sysctl/manifest b/cdist/conf/type/__sysctl/manifest
index c903dbae..6e337ccb 100755
--- a/cdist/conf/type/__sysctl/manifest
+++ b/cdist/conf/type/__sysctl/manifest
@@ -32,8 +32,10 @@ case "$os" in
    ;;
 esac
 
+conf_path=$(cat "$__object/explorer/conf-path")
+
 __key_value "$__object_name" \
    --key "$__object_id" \
-   --file /etc/sysctl.conf \
+   --file "${conf_path}" \
    --value "$(cat "$__object/parameter/value")" \
    --delimiter '='