vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1273 from mrunalp/pr1245_1.9

Browse source 
Backport 1.9: contrib: system containers read env from /etc/sysconfig/crio-(network|storage)
This commit is contained in:
Antonio Murdaca 2018-01-22 17:13:42 +01:00 committed by GitHub
commit ea0e8fdcef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/system_containers/centos/run.sh
View file

@ -5,4 +5,7 @@ PID=$$
LABEL=`tr -d '\000' < /proc/$PID/attr/current` LABEL=`tr -d '\000' < /proc/$PID/attr/current`
printf %s $LABEL > /proc/self/attr/exec printf %s $LABEL > /proc/self/attr/exec
test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
exec /usr/bin/crio --log-level=$LOG_LEVEL exec /usr/bin/crio --log-level=$LOG_LEVEL

3
contrib/system_containers/fedora/run.sh
View file

@ -5,4 +5,7 @@ PID=$$
LABEL=`tr -d '\000' < /proc/$PID/attr/current` LABEL=`tr -d '\000' < /proc/$PID/attr/current`
printf %s $LABEL > /proc/self/attr/exec printf %s $LABEL > /proc/self/attr/exec
test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
exec /usr/bin/crio --log-level=$LOG_LEVEL exec /usr/bin/crio --log-level=$LOG_LEVEL

3
contrib/system_containers/rhel/run.sh
View file

@ -5,4 +5,7 @@ PID=$$
LABEL=`tr -d '\000' < /proc/$PID/attr/current` LABEL=`tr -d '\000' < /proc/$PID/attr/current`
printf %s $LABEL > /proc/self/attr/exec printf %s $LABEL > /proc/self/attr/exec
test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
exec /usr/bin/crio --log-level=$LOG_LEVEL exec /usr/bin/crio --log-level=$LOG_LEVEL