From 4a89e6411597485bfef4baa7b0bccf272cc5203d Mon Sep 17 00:00:00 2001
From: Arkaitz Jimenez <arkaitzj@gmail.com>
Date: Mon, 1 Apr 2013 00:47:57 +0200
Subject: [PATCH 1/2] Make global explorers available to initial manifest and
 fix hostname explorer

---
 cdist/conf/explorer/hostname | 4 ++--
 cdist/core/manifest.py       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index 2ae23759..881c910a 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -20,6 +20,6 @@
 #
 #
 
-if command -v hostname; then
-   hostname
+if command -v hostname >/dev/null; then
+   hostname -f
 fi
diff --git a/cdist/core/manifest.py b/cdist/core/manifest.py
index 19639618..8da7f96d 100644
--- a/cdist/core/manifest.py
+++ b/cdist/core/manifest.py
@@ -106,6 +106,7 @@ class Manifest(object):
         env.update(self.env)
         env['__cdist_manifest'] = initial_manifest
         env['__manifest'] = self.local.manifest_path
+        env['__explorer'] = self.local.global_explorer_out_path
 
         return env
 

From 0db80189d74c2bfcf4bc2a85a345b5ec4eabdafc Mon Sep 17 00:00:00 2001
From: Arkaitz Jimenez <arkaitzj@gmail.com>
Date: Tue, 2 Apr 2013 10:15:03 +0000
Subject: [PATCH 2/2] Updated doc regarding global explorer availability

---
 docs/man/cdist-reference.text.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index 225d647f..7ee2224a 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -179,7 +179,7 @@ ENVIRONMENT VARIABLES
 ---------------------
 __explorer::
     Directory that contains all global explorers.
-    Available for: explorer, type explorer
+    Available for: initial manifest, explorer, type explorer
 __manifest::
     Directory that contains the initial manifest.
     Available for: initial manifest, type manifest