Merge pull request cri-o#6468 from haircommander/fix-script

haircommander · web-flow · commit c25920c51f20 · 2022-12-22T16:10:12.000-05:00
get script: fix conflist path
diff --git a/contrib/bundle/build b/contrib/bundle/build
@@ -36,7 +36,7 @@ FILES_ETC=(
     "$GIT_ROOT/contrib/bundle/10-crun.conf"
 )
 FILES_CONTRIB=(
-    "$GIT_ROOT/contrib/cni/10-crio-bridge.conflist"
+    "$GIT_ROOT/contrib/cni/11-crio-ipv4-bridge.conflist"
     "$GIT_ROOT/contrib/policy.json"
     "$GIT_ROOT/contrib/systemd/crio.service"
 )
diff --git a/contrib/bundle/install b/contrib/bundle/install
@@ -1,7 +1,7 @@
 set -x
 install $SELINUX -d -m 755 "$DESTDIR$CNIDIR"
 install $SELINUX -D -m 755 -t "$DESTDIR$OPT_CNI_BIN_DIR" cni-plugins/*
-install $SELINUX -D -m 644 -t "$DESTDIR$CNIDIR" /contrib/cni/10-crio-bridge.conflist
+install $SELINUX -D -m 644 -t "$DESTDIR$CNIDIR" contrib/11-crio-ipv4-bridge.conflist
 install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/conmon
 install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/crictl
 install $SELINUX -d -m 755 "$DESTDIR$BASHINSTALLDIR"
diff --git a/scripts/get b/scripts/get
@@ -212,7 +212,7 @@ ARCH=${ARCH:-amd64}
 set -x
 install $SELINUX -d -m 755 "$DESTDIR$CNIDIR"
 install $SELINUX -D -m 755 -t "$DESTDIR$OPT_CNI_BIN_DIR" cni-plugins/*
-install $SELINUX -D -m 644 -t "$DESTDIR$CNIDIR" /contrib/cni/10-crio-bridge.conflist
+install $SELINUX -D -m 644 -t "$DESTDIR$CNIDIR" contrib/10-crio-bridge.conflist
 install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/conmon
 install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/crictl
 install $SELINUX -d -m 755 "$DESTDIR$BASHINSTALLDIR"

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ FILES_ETC=(`
`36`	`36`	`"$GIT_ROOT/contrib/bundle/10-crun.conf"`
`37`	`37`	`)`
`38`	`38`	`FILES_CONTRIB=(`
`39`		`- "$GIT_ROOT/contrib/cni/10-crio-bridge.conflist"`
	`39`	`+ "$GIT_ROOT/contrib/cni/11-crio-ipv4-bridge.conflist"`
`40`	`40`	`"$GIT_ROOT/contrib/policy.json"`
`41`	`41`	`"$GIT_ROOT/contrib/systemd/crio.service"`
`42`	`42`	`)`