From 93621f7adae93222126771d601edb8f50780af64 Mon Sep 17 00:00:00 2001
From: Louis Woods <louis.woods@apcera.com>
Date: Fri, 5 Oct 2018 14:15:52 -0700
Subject: [PATCH] Improve grep in entrypoint.sh to only find .conf and
 .conflist files

---
 images/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/entrypoint.sh b/images/entrypoint.sh
index 542393825..679acaa0d 100755
--- 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;