From 0e8055d2b3d385417cf754a07ad069931fff0869 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Oct 2020 07:53:28 -0400 Subject: [PATCH] NM detection for Ubuntu 20.10 etc --- scripts/local_facts.fact | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index 41b9c1577..e85801976 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -104,8 +104,10 @@ tmp=$(systemctl is-enabled dhcpcd) DHCPCD=$tmp #[[ $tmp ]] && DHCPCD=$tmp # Short Ain't Sweet (less understandable) -# Debian family only, as is_redhat would use NetworkManager as the service name -tmp=$(systemctl is-enabled network-manager) +# is_redhat uses "NetworkManager". Debian 7 & Ubuntu 14.10 required +# "network-manager" (prior to 2015/systemd). Ubuntu 20.10 dropped the +# legacy symlink from "network-manager" to "NetworkManager" +tmp=$(systemctl is-enabled NetworkManager) [[ $tmp != "" ]] && NETWORK_MANAGER=$tmp