Merge 93621f7 into 46a0f75

k8snetworkplumbingwg · Oct 5, 2018 · 8052606 · 8052606
2 parents 46a0f75 + 93621f7
commit 8052606
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/images/entrypoint.sh b/images/entrypoint.sh
@@ -151,7 +151,7 @@ fi
 
 if [ "$MULTUS_CONF_FILE" == "auto" ]; then
   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
     echo "Error: Multus could not be configured: no master plugin was found."
     exit 1;