diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 15:42:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 15:42:06 -0500 |
commit | 094b11cbcb528a7d120c31402a1bcd9c82d84938 (patch) | |
tree | 3ce00f13dda775d979a093658f26cea4122646d9 /hack | |
parent | 62212dbf490d736ad06523a92345a480e4972dab (diff) | |
parent | c0e07234631cfcea1d6724c05606964a4d833f39 (diff) | |
download | podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.gz podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.bz2 podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.zip |
Merge pull request #12908 from Luap99/network-conf-dir
rename --cni-config-dir to --network-config-dir
Diffstat (limited to 'hack')
-rwxr-xr-x | hack/podman-socat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hack/podman-socat b/hack/podman-socat index 6ee6b89d8..28fbb6864 100755 --- a/hack/podman-socat +++ b/hack/podman-socat @@ -95,7 +95,7 @@ EOT PODMAN_ARGS="--storage-driver=vfs \ --root=${TMPDIR}/crio \ --runroot=${TMPDIR}/crio-run \ - --cni-config-dir=$CNI_CONFIG_PATH \ + --network-config-dir=$CNI_CONFIG_PATH \ --cgroup-manager=systemd \ " if [[ -n $VERBOSE ]]; then |