From 601722d403caa1cdb08c967027f0bae362e9cd5e Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Tue, 17 Jan 2012 10:23:46 +0100 Subject: [PATCH] Do not use system shell --- slapos/recipe/generic_kumofs/__init__.py | 1 + slapos/recipe/generic_kumofs/template/kumo_gateway.in | 2 +- slapos/recipe/generic_kumofs/template/kumo_manager.in | 2 +- slapos/recipe/generic_kumofs/template/kumo_server.in | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/slapos/recipe/generic_kumofs/__init__.py b/slapos/recipe/generic_kumofs/__init__.py index 0b939c887..d18dcfa11 100644 --- a/slapos/recipe/generic_kumofs/__init__.py +++ b/slapos/recipe/generic_kumofs/__init__.py @@ -53,6 +53,7 @@ class Recipe(GenericBaseRecipe): kumo_server_port=kumo_server_port, kumo_server_listen_port=kumo_server_listen_port, kumo_gateway_port=kumo_gateway_port + shell_path=self.options['shell-path'], ) path_list.append(self.createExecutable(self.options['gateway-wrapper'], diff --git a/slapos/recipe/generic_kumofs/template/kumo_gateway.in b/slapos/recipe/generic_kumofs/template/kumo_gateway.in index 912f8f100..f18c8a4ec 100644 --- a/slapos/recipe/generic_kumofs/template/kumo_gateway.in +++ b/slapos/recipe/generic_kumofs/template/kumo_gateway.in @@ -1,2 +1,2 @@ -#!/bin/sh +#!%(shell_path)s exec %(kumo_gateway_binary)s -F -E -m %(kumo_manager_ip)s:%(kumo_manager_port)s -t %(kumo_gateway_ip)s:%(kumo_gateway_port)s -o %(kumo_gateway_log)s diff --git a/slapos/recipe/generic_kumofs/template/kumo_manager.in b/slapos/recipe/generic_kumofs/template/kumo_manager.in index e63e3c569..25e2ed1a0 100644 --- a/slapos/recipe/generic_kumofs/template/kumo_manager.in +++ b/slapos/recipe/generic_kumofs/template/kumo_manager.in @@ -1,2 +1,2 @@ -#!/bin/sh +#!%(shell_path)s exec %(kumo_manager_binary)s -a -l %(kumo_manager_ip)s:%(kumo_manager_port)s -o %(kumo_manager_log)s diff --git a/slapos/recipe/generic_kumofs/template/kumo_server.in b/slapos/recipe/generic_kumofs/template/kumo_server.in index 81aeabb32..aba0ac6f2 100644 --- a/slapos/recipe/generic_kumofs/template/kumo_server.in +++ b/slapos/recipe/generic_kumofs/template/kumo_server.in @@ -1,2 +1,2 @@ -#!/bin/sh +#!%(shell_path)s exec %(kumo_server_binary)s -l %(kumo_server_ip)s:%(kumo_server_port)s -L %(kumo_server_listen_port)s -m %(kumo_manager_ip)s:%(kumo_manager_port)s -s %(kumo_server_storage)s -o %(kumo_server_log)s -- 2.30.9