From 4a89e6411597485bfef4baa7b0bccf272cc5203d Mon Sep 17 00:00:00 2001 From: Arkaitz Jimenez Date: Mon, 1 Apr 2013 00:47:57 +0200 Subject: [PATCH] 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