From de43f4d5d87a0919273d2b9972d875234ce41eae Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 17 Feb 2011 16:33:16 +0100
Subject: [PATCH] fix initial manifest and reorder HACKERS_README
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
HACKERS_README | 12 ++++++------
conf/manifests/init | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HACKERS_README b/HACKERS_README
index aa3d937d..3ddbd0b8 100755
--- a/HACKERS_README
+++ b/HACKERS_README
@@ -35,6 +35,12 @@ explorer_tmp=/tmp/localhost/explorers
exec_tmp=/tmp/localhost/exec
+# Run explorer on a "remote" host
+cdist-explorer-run localhost "$explorer_tmp"
+
+# Display result
+find "$explorer_tmp"
+
# Test first level manifest execution
cdist-manifest-init localhost "$object_tmp"
@@ -47,12 +53,6 @@ cdist-manifest-run-all localhost "$object_tmp"
# See what it generated
find "$object_tmp"
-# Run explorer on a "remote" host
-cdist-explorer-run localhost "$explorer_tmp"
-
-# Display result
-find "$explorer_tmp"
-
# Generate code for all objects in object dir
cdist-object-codegen-all localhost "$object_tmp" "$exec_tmp"
diff --git a/conf/manifests/init b/conf/manifests/init
index 2923ba88..edc380fa 100755
--- a/conf/manifests/init
+++ b/conf/manifests/init
@@ -5,7 +5,9 @@
# All ikqs get a sample file
case "$__cdist_target_host" in
ikq*|localhost)
- __file cdist-config --source /home/users/nico/p/cdist/bin/cdist-config --destination /usr/bin/cdist-config
+ __file cdist-config --source /home/users/nico/p/cdist/bin/cdist-config \
+ --destination /usr/bin/cdist-config \
+ --type file
__issue iddoesnotmatterhere
;;
esac