From a609be649b10c9edadcf5762938bc259c89ae7ec Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 4 Mar 2020 17:51:25 +0100
Subject: [PATCH] version up: slapos.cookbook 1.0.139

---
 slapos/recipe/wrapper.py        | 3 ---
 stack/erp5/buildout.hash.cfg    | 2 +-
 stack/erp5/instance-zope.cfg.in | 5 ++++-
 stack/slapos.cfg                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/slapos/recipe/wrapper.py b/slapos/recipe/wrapper.py
index 6fa1ba3c5..9e51e5267 100644
--- a/slapos/recipe/wrapper.py
+++ b/slapos/recipe/wrapper.py
@@ -77,9 +77,6 @@ class Recipe(GenericBaseRecipe):
         wait_files = options.get('wait-for-files')
         pidfile = options.get('pidfile')
         private_tmpfs = self.parsePrivateTmpfs()
-        private_dev_shm = options.get('private-dev-shm') # BBB
-        if private_dev_shm:
-          private_tmpfs.append((private_dev_shm, '/dev/shm'))
 
         environment = {}
         for line in (options.get('environment') or '').splitlines():
diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg
index abf0b5ffa..6e41a6f70 100644
--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 8b4a15dca7e30ba5a792f1a9622216b0
+md5sum = e9032f39c6e5db684342491fdeb4624c
 
 [template-balancer]
 filename = instance-balancer.cfg.in
diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in
index 4ef496a64..1ecdcdc60 100644
--- a/stack/erp5/instance-zope.cfg.in
+++ b/stack/erp5/instance-zope.cfg.in
@@ -189,7 +189,10 @@ wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %
 {% else -%}
 wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
 {%- endif %}
-private-dev-shm = {{ slapparameter_dict['private-dev-shm'] }}
+{%- set private_dev_shm = slapparameter_dict['private-dev-shm'] %}
+{%- if private_dev_shm %}
+private-tmpfs = {{ private_dev_shm }} /dev/shm
+{%- endif %}
 
 [{{ section('zcml') }}]
 recipe = slapos.cookbook:copyfilelist
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index d005ff141..b055172c6 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -137,7 +137,7 @@ pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
-slapos.cookbook = 1.0.138
+slapos.cookbook = 1.0.139
 slapos.core = 1.5.9
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
-- 
2.30.9