From 6917e28d2d16138d6d497dc96efafe573b4b0979 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 4 Oct 2019 00:23:38 +0200 Subject: Install directories as created by upstream build system Drop network-manager.dirs and instead use the directories created by the upstream build system. Fix permissions of /var/lib/NetworkManager to be 0700 as it contains possibly sensitive data and should not be world-readable. --- debian/network-manager.dirs | 10 ---------- debian/network-manager.install | 8 +++----- debian/network-manager.postinst | 3 +++ 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 debian/network-manager.dirs diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs deleted file mode 100644 index e09403be..00000000 --- a/debian/network-manager.dirs +++ /dev/null @@ -1,10 +0,0 @@ -etc/NetworkManager/conf.d/ -etc/NetworkManager/dispatcher.d/no-wait.d/ -etc/NetworkManager/dispatcher.d/pre-down.d/ -etc/NetworkManager/dispatcher.d/pre-up.d/ -etc/NetworkManager/dnsmasq.d/ -etc/NetworkManager/dnsmasq-shared.d/ -etc/NetworkManager/system-connections/ -usr/lib/NetworkManager/conf.d/ -usr/lib/NetworkManager/VPN/ -var/lib/NetworkManager/ diff --git a/debian/network-manager.install b/debian/network-manager.install index 0f1e82ae..3f94d7a4 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -2,10 +2,7 @@ usr/sbin/NetworkManager usr/bin/nm-online usr/bin/nmcli usr/bin/nmtui* -usr/lib/NetworkManager/nm-dhcp-helper -usr/lib/NetworkManager/nm-iface-helper -usr/lib/NetworkManager/nm-dispatcher -usr/lib/NetworkManager/nm-initrd-generator +usr/lib/NetworkManager/ usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so @@ -18,7 +15,8 @@ usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf usr/share/dbus-1/system.d/nm-dispatcher.conf usr/share/polkit-1/ usr/share/bash-completion/ -etc/NetworkManager/dispatcher.d/ +etc/NetworkManager/ +var/lib/NetworkManager/ lib/udev/rules.d/*.rules lib/systemd/system/NetworkManager.service lib/systemd/system/NetworkManager-dispatcher.service diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 0f95087f..ee139d90 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -24,6 +24,9 @@ case "$1" in # org.freedesktop.NetworkManager.settings.modify.system without prior authentication addgroup --quiet --system netdev + # This directory can contain sensitive data and should not be world-readable + chmod 0700 /var/lib/NetworkManager + NIF=/etc/network/interfaces if [ -z "$2" ] && [ -f $NIF ]; then ifaces=`grep -v '^#' $NIF | awk '/iface/ {print $2}' | sort -u | sed -e 's/lo//' -e '/^$/d' -e 's/^/- /'` -- cgit 1.3.0-6-gf8a5