Merge pull request #320 from simonbru/fix-nm-cleanup

Fix clean-up of unmanaged devices in NetworkManager.conf
This commit is contained in:
Lakindu Akash 2023-11-12 02:25:36 +05:30 committed by GitHub
commit 59564a79ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -509,7 +509,7 @@ networkmanager_add_unmanaged() {
fi fi
mutex_lock mutex_lock
UNMANAGED=$(grep -m1 -Eo '^unmanaged-devices=[[:alnum:]:;,-]*' /etc/NetworkManager/NetworkManager.conf) UNMANAGED=$(grep -m1 -Eo '^unmanaged-devices=[[:alnum:]:;,?*~=-]*' /etc/NetworkManager/NetworkManager.conf)
WAS_EMPTY=0 WAS_EMPTY=0
[[ -z "$UNMANAGED" ]] && WAS_EMPTY=1 [[ -z "$UNMANAGED" ]] && WAS_EMPTY=1
@ -566,7 +566,7 @@ networkmanager_rm_unmanaged() {
fi fi
mutex_lock mutex_lock
UNMANAGED=$(grep -m1 -Eo '^unmanaged-devices=[[:alnum:]:;,-]*' /etc/NetworkManager/NetworkManager.conf | sed 's/unmanaged-devices=//' | tr ';,' ' ') UNMANAGED=$(grep -m1 -Eo '^unmanaged-devices=[[:alnum:]:;,?*~=-]*' /etc/NetworkManager/NetworkManager.conf | sed 's/unmanaged-devices=//' | tr ';,' ' ')
if [[ -z "$UNMANAGED" ]]; then if [[ -z "$UNMANAGED" ]]; then
mutex_unlock mutex_unlock