github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-25 19:44:28 +00:00
Code Issues Projects Releases Wiki Activity

Improve grep in entrypoint.sh to only find .conf and .conflist files

Browse Source
This commit is contained in:
Louis Woods 2018-10-05 14:15:52 -07:00 committed by Tomofumi Hayashi
parent bae3adf158
commit 93237e6161
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/entrypoint.sh
View File

@ -151,7 +151,7 @@ fi
if [ "$MULTUS_CONF_FILE" == "auto" ]; then if [ "$MULTUS_CONF_FILE" == "auto" ]; then
echo "Generating Multus configuration file ..." echo "Generating Multus configuration file ..."
MASTER_PLUGIN="$(ls $CNI_CONF_DIR | grep .conf | head -1)" MASTER_PLUGIN="$(ls $CNI_CONF_DIR | grep -E '\.conf(list)?$' | head -1)"
if [ "$MASTER_PLUGIN" == "" ]; then if [ "$MASTER_PLUGIN" == "" ]; then
echo "Error: Multus could not be configured: no master plugin was found." echo "Error: Multus could not be configured: no master plugin was found."
exit 1; exit 1;