@@ -198,12 +198,12 @@ function start_service() {
198
198
199
199
# FIXME: use ${testname} subdir but we can't: 50-char limit in runroot
200
200
if ! is_rootless; then
201
- rm -rf $WORKDIR /{root,runroot,cni }
201
+ rm -rf $WORKDIR /{root,runroot,networks }
202
202
else
203
- $PODMAN_BIN unshare rm -rf $WORKDIR /{root,runroot,cni }
203
+ $PODMAN_BIN unshare rm -rf $WORKDIR /{root,runroot,networks }
204
204
fi
205
205
rm -f $DOCKER_SOCK
206
- mkdir --mode 0755 $WORKDIR /{root,runroot,cni }
206
+ mkdir --mode 0755 $WORKDIR /{root,runroot,networks }
207
207
chcon --reference=/var/lib/containers $WORKDIR /root
208
208
209
209
$PODMAN_BIN \
@@ -212,7 +212,7 @@ function start_service() {
212
212
--root $WORKDIR /root \
213
213
--runroot $WORKDIR /runroot \
214
214
--cgroup-manager=systemd \
215
- --network-config-dir $WORKDIR /cni \
215
+ --network-config-dir $WORKDIR /networks \
216
216
system service \
217
217
--time 0 unix://$DOCKER_SOCK \
218
218
& > $WORKDIR /server.log &
@@ -239,7 +239,7 @@ function podman() {
239
239
--storage-driver=vfs \
240
240
--root $WORKDIR /root \
241
241
--runroot $WORKDIR /runroot \
242
- --network-config-dir $WORKDIR /cni \
242
+ --network-config-dir $WORKDIR /networks \
243
243
" $@ " )
244
244
rc=$?
245
245
0 commit comments