Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kwabena Antwi-Boasiako
slapos
Commits
b3906f33
Commit
b3906f33
authored
Jan 11, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrapper script: workaround kernel limitation in shebang line length
http://stackoverflow.com/a/10826085
parent
e55d4218
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
7 deletions
+28
-7
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+17
-3
slapos/recipe/wrapper.py
slapos/recipe/wrapper.py
+11
-4
No files found.
slapos/recipe/librecipe/generic.py
View file @
b3906f33
...
...
@@ -134,13 +134,14 @@ class GenericBaseRecipe(object):
pidfile
=
None
):
"""
Creates a
very simple (one command)
shell script for process replacement.
Creates a shell script for process replacement.
Takes care of quoting.
Takes care of #! line limitation when the wrapped command is a script.
if pidfile parameter is specified, then it will make the wrapper a singleton,
accepting to run only if no other instance is running.
"""
lines
=
[
'#!/bin/sh'
]
lines
=
[
'#!/bin/
ba
sh'
]
for
comment
in
comments
:
lines
.
append
(
'# %s'
%
comment
)
...
...
@@ -164,7 +165,20 @@ class GenericBaseRecipe(object):
fi
echo $$ > $pidfile"""
%
(
pidfile
,
command
)))
lines
.
append
(
'exec %s'
%
shlex
.
quote
(
command
))
# Inspired by http://stackoverflow.com/a/10826085
lines
.
append
(
dedent
(
"""
\
COMMAND=%s
# If the wrapped command uses a shebang, execute the referenced
# executable passing the script path as first argument.
# This is to workaround the limitation of 127 characters in #!
if [ $(head -c2 "$COMMAND") = "#!" ]; then
SHEBANG=$(head -1 "$COMMAND")
INTERPRETER=( ${SHEBANG#
\
#!} )
COMMAND="${INTERPRETER[@]} $COMMAND"
fi
exec $COMMAND """
%
shlex
.
quote
(
command
)))
for
param
in
parameters
:
if
len
(
lines
[
-
1
])
<
40
:
...
...
slapos/recipe/wrapper.py
View file @
b3906f33
...
...
@@ -54,8 +54,15 @@ class Recipe(GenericBaseRecipe):
if
environment
is
not
None
:
environment
=
dict
((
k
.
strip
(),
v
.
strip
())
for
k
,
v
in
[
line
.
split
(
'='
)
for
line
in
environment
.
splitlines
()
if
line
.
strip
()
])
return
[
self
.
createPythonScript
(
wrapper_path
,
# We create a python script and a wrapper around the python
# script because the python script might have a too long #! line
python_script
=
self
.
createPythonScript
(
wrapper_path
+
'.py'
,
'slapos.recipe.librecipe.execute.generic_exec'
,
(
command_line
,
wait_files
,
environment
,),
)]
(
command_line
,
wait_files
,
environment
,),
)
return
[
python_script
,
self
.
createWrapper
(
name
=
wrapper_path
,
command
=
python_script
,
parameters_extra
=
parameters_extra
)
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment