diff options
| author | Michael Biebl <biebl@debian.org> | 2019-10-04 00:23:38 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-10-04 15:04:51 +0200 |
| commit | 515c3cb6b306fc885dea3b28668ae77cdb254d1a (patch) | |
| tree | 651ad0d5c502fc69f33393e2bfe84999697f7d10 | |
| parent | 818a190f256f7b4c6a11943296574d1eef7fd172 (diff) | |
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.
| -rw-r--r-- | debian/network-manager.dirs | 10 | ||||
| -rw-r--r-- | debian/network-manager.install | 8 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 3 |
3 files changed, 6 insertions, 15 deletions
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 674fac34..7f0589da 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/^/- /'` |