Use dash

c4b14b14 · Cédric de Saint Martin · 0fd2f305 · c4b14b14 · c4b14b14 · c4b14b14
Commit c4b14b14 authored Mar 09, 2012 by Cédric de Saint Martin
Showing with 3 additions and 3 deletions

slapos/recipe/occi/template/accords.in slapos/recipe/occi/template/accords.in +1 -2

stack/occi/buildout.cfg stack/occi/buildout.cfg +1 -0

stack/occi/instance-occi.cfg stack/occi/instance-occi.cfg +1 -1

No files found.
--- a/slapos/recipe/occi/template/accords.in
+++ b/slapos/recipe/occi/template/accords.in
-#!/bin/sh
+#!%(dash_location)s
-#Should be #!(dash_location)s
 #Workaround
 LD_LIBRARY_PATH=%(accords_lib_directory)s

--- a/stack/occi/buildout.cfg
+++ b/stack/occi/buildout.cfg
 [buildout]
 extends =
+  ../../component/dash/buildout.cfg
  ../../component/dcron/buildout.cfg
  ../../component/logrotate/buildout.cfg
  ../../component/occi/buildout.cfg

--- a/stack/occi/instance-occi.cfg
+++ b/stack/occi/instance-occi.cfg
@@ -27,7 +27,7 @@ os-config = $${pocdirectory:poc}/os_config.xml
 manifest-source = ${occi-manifest:target}
 manifest-destination = $${pocdirectory:poc}/manifest.xml
 manifest-name = $${pocdirectory:poc}/manifest.xml
-dash-location = TODO
+dash-location = ${dash:location}/bin/dash
 # Workaround
 accords_lib_directory : ${accords:location}/lib