From 3881f375b9ac87d9e5be636293d8f44d7d693b94 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 4 Jan 2018 20:14:29 +0100 Subject: [PATCH 1/3] syscontainer, rhel: read env variables from files Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/rhel/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/system_containers/rhel/run.sh b/contrib/system_containers/rhel/run.sh index 5621a7ba..7f34fd42 100755 --- a/contrib/system_containers/rhel/run.sh +++ b/contrib/system_containers/rhel/run.sh @@ -5,4 +5,7 @@ PID=$$ LABEL=`tr -d '\000' < /proc/$PID/attr/current` 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 From 1f75ec82e1f79c5b4adc6a0b830782ac61226a92 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 4 Jan 2018 20:14:39 +0100 Subject: [PATCH 2/3] syscontainer, fedora: read env variables from files Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/fedora/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/system_containers/fedora/run.sh b/contrib/system_containers/fedora/run.sh index 5621a7ba..7f34fd42 100755 --- a/contrib/system_containers/fedora/run.sh +++ b/contrib/system_containers/fedora/run.sh @@ -5,4 +5,7 @@ PID=$$ LABEL=`tr -d '\000' < /proc/$PID/attr/current` 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 From b5167d4e8ffc4e3351fc0c9db00f74cfc8c470ed Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 4 Jan 2018 20:14:52 +0100 Subject: [PATCH 3/3] syscontainer, centos: read env variables from files Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/centos/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/system_containers/centos/run.sh b/contrib/system_containers/centos/run.sh index 5621a7ba..7f34fd42 100755 --- a/contrib/system_containers/centos/run.sh +++ b/contrib/system_containers/centos/run.sh @@ -5,4 +5,7 @@ PID=$$ LABEL=`tr -d '\000' < /proc/$PID/attr/current` 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