github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-30 23:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from Kusanagi9999/improved-grep-to-search-for-conffiles

Browse Source 
Improve grep in entrypoint.sh to only find .conf and .conflist files
This commit is contained in:
Doug Smith 2018-10-10 14:42:42 -04:00 committed by GitHub
commit 1caddaef4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
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;