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

Install conmon in /usr/libexec/ocid/conmon

Browse source 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Dan Walsh 2016-09-28 15:49:46 -04:00
parent 47c993f2e1
commit f51c98b057
6 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/helpers.bash
View file

@ -70,7 +70,7 @@ function wait_until_reachable() {
# Start ocid.
function start_ocid() {
"$OCID_BINARY" --debug --socket "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
"$OCID_BINARY" --conmon "$CONMON_BINARY" --debug --socket "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" --sandboxdir "$TESTDIR/sandboxes" --containerdir "$TESTDIR/ocid/containers" & OCID_PID=$!
wait_until_reachable
}