diff options
Diffstat (limited to 'source/n/NetworkManager')
| -rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/NetworkManager/conf.d/00-dhcp-client.conf | 23 |
2 files changed, 19 insertions, 6 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index fb108b5bf..3cfd061d4 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/n/NetworkManager/conf.d/00-dhcp-client.conf b/source/n/NetworkManager/conf.d/00-dhcp-client.conf index 8f4356924..53e30c85d 100644 --- a/source/n/NetworkManager/conf.d/00-dhcp-client.conf +++ b/source/n/NetworkManager/conf.d/00-dhcp-client.conf @@ -1,9 +1,22 @@ [main] # Choose a DHCP client below. Upstream recommends internal, but results may vary. -# dhcpcd is the DHCP client usually used by Slackware. The --noconfigure -# option must be used or the network will not return after suspend/resume: -dhcp=dhcpcd --noconfigure +# +# This is a simple DHCP client that is built into NetworkManager: +dhcp=internal +# # dhclient is the ISC reference DHCP client, part of the dhcp package: #dhcp=dhclient -# This is a simple DHCP client that is built into NetworkManager: -#dhcp=internal +# +# dhcpcd is the DHCP client usually used by Slackware. However, it is built +# with --enable-privsep, and a side-effect of this when used with +# NetworkManager is that the network will not return properly after a +# suspend/resume cycle. If you don't require this functionality, dhcpcd will +# work fine otherwise. If you do require it and don't want to use one of the +# other two options here, there are some workarounds. +# You may force NetworkManager to reload the network by killing dhcpcd: +# killall -9 dhcpcd +# Otherwise, you may rebuild the dhcpcd package without privilege separation +# using the following command in the dhcpcd source directory: +# PRIVSEP=no ./dhcpcd.SlackBuild +# The resulting dhcpcd package will work fine with NetworkManager. +#dhcp=dhcpcd |