Show More
@@ -0,0 +1,16 b'' | |||||
|
1 | diff -rup supervisor-3.3.4-orig/supervisor/options.py supervisor-3.3.4/supervisor/options.py | |||
|
2 | --- supervisor-3.3.4-orig/supervisor/options.py 1970-01-01 01:00:01.000000000 +0100 | |||
|
3 | +++ supervisor-3.3.4/supervisor-new/options.py 2018-10-24 10:53:19.368503735 +0200 | |||
|
4 | @@ -1395,7 +1395,11 @@ class ServerOptions(Options): | |||
|
5 | name = limit['name'] | |||
|
6 | name = name # name is used below by locals() | |||
|
7 | ||||
|
8 | - soft, hard = resource.getrlimit(res) | |||
|
9 | + try: | |||
|
10 | + soft, hard = resource.getrlimit(res) | |||
|
11 | + except Exception: | |||
|
12 | + # handle old kernel problems, this is not critical to execute | |||
|
13 | + soft, hard = -1, -1 | |||
|
14 | ||||
|
15 | if (soft < min) and (soft != -1): # -1 means unlimited | |||
|
16 | if (hard < min) and (hard != -1): |
@@ -240,6 +240,12 b' self: super: {' | |||||
240 | }; |
|
240 | }; | |
241 | }); |
|
241 | }); | |
242 |
|
242 | |||
|
243 | "supervisor" = super."supervisor".override (attrs: { | |||
|
244 | patches = [ | |||
|
245 | ./patches/supervisor/patch-rlimits-old-kernel.diff | |||
|
246 | ]; | |||
|
247 | }); | |||
|
248 | ||||
243 | # Avoid that base packages screw up the build process |
|
249 | # Avoid that base packages screw up the build process | |
244 | inherit (basePythonPackages) |
|
250 | inherit (basePythonPackages) | |
245 | setuptools; |
|
251 | setuptools; |
General Comments 0
You need to be logged in to leave comments.
Login now