diff --git a/etc/NetworkManager/NetworkManager.conf b/etc/NetworkManager/NetworkManager.conf index 5de03f25..d3317c11 100644 --- a/etc/NetworkManager/NetworkManager.conf +++ b/etc/NetworkManager/NetworkManager.conf @@ -1,15 +1,24 @@ +## I am using this file supporting memory, I don't copy-paste this +## directly to anywhere. + [main] # Ubuntu defaults plugins=ifupdown,keyfile,ofono -# Use dnssec-triggerd +# Use dnssec-triggerd (or dnsmasq at home) dns=unbound +[keyfile] +# Disable misbehaving NIC +unmanaged-devices=mac:xx:xx:xx:xx:xx:xx +#hostname=HOSTNAME_TO_SEND_TO_DHCPD + [ifupdown] # more Ubuntu defaults managed=false ## HTTP-based connectivity check [connectivity] +# On Arch I seem to be using the default instead. uri=http://koti.kapsi.fi/~mikaela/check_network_status.txt interval=300 diff --git a/etc/NetworkManager/NetworkManager.conf.arch b/etc/NetworkManager/NetworkManager.conf.arch new file mode 100644 index 00000000..8f60e100 --- /dev/null +++ b/etc/NetworkManager/NetworkManager.conf.arch @@ -0,0 +1,12 @@ +[main] +plugins=keyfile +dns=dnsmasq + +## HTTP-based connectivity check +[connectivity] +uri=http://nmcheck.gnome.org/check_network_status.txt +interval=100 + +[keyfile] +#unmanaged-devices=mac:xx:xx:xx:xx:xx:xx +#hostname=HOSTNAME_FOR_DHCPD