sync with upstream

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Disable the auto-build. That's not working with that flag
2018-01-10 09:53:53 +01:00 · 2018-01-10 00:48:54 +01:00 · 2017-11-17 14:13:35 +01:00
5 changed files with 7 additions and 6 deletions
--- a/.osbs-repo-config
+++ b/.osbs-repo-config
@ -1,3 +0,0 @@
-[autorebuild]
-enabled = true
-
--- a/4
+++ b/4
@ -1,6 +1,6 @@
-FROM registry.fedoraproject.org/fedora:27
+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" \
--- 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
--- 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
--- 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               -        -           -       - -
Author	SHA1	Message	Date
Giuseppe Scrivano	8e4793fa51	sync with upstream Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>	2018-01-10 09:53:53 +01:00
Patrick Uiterwijk	b1ca09f903	Disable the auto-build. That's not working with that flag Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>	2018-01-10 00:48:54 +01:00
Giuseppe Scrivano	a62837de65	base master on rawhide	2017-11-17 14:13:35 +01:00