From 8e4793fa51c3c95dcc7028591d41a3998db650e0 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Jan 10 2018 08:53:53 +0000
Subject: sync with upstream


Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

---

diff --git a/Dockerfile b/Dockerfile
index 2c837b6..cecde21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.fedoraproject.org/fedora:rawhide
 
-ENV VERSION=0 RELEASE=3 ARCH=x86_64
+ENV VERSION=0 RELEASE=4 ARCH=x86_64
 LABEL com.redhat.component="cri-o" \
       name="$FGC/cri-o" \
       version="$VERSION" \
diff --git a/run.sh b/run.sh
index 5621a7b..7f34fd4 100755
--- a/run.sh
+++ b/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
diff --git a/service.template b/service.template
index daa9ffd..4c08b39 100644
--- a/service.template
+++ b/service.template
@@ -14,6 +14,7 @@ TasksMax=infinity
 LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitCORE=infinity
+TimeoutStartSec=0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tmpfiles.template b/tmpfiles.template
index 015919c..9447267 100644
--- a/tmpfiles.template
+++ b/tmpfiles.template
@@ -1,4 +1,4 @@
-d    ${RUN_DIRECTORY}/${NAME}               -        -           -       - -
+d    ${RUN_DIRECTORY}/crio               -        -           -       - -
 d    /etc/crio - - - - -
 Z    /etc/crio - - - - -
 d    ${STATE_DIRECTORY}/origin               -        -           -       - -