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 | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index f607e36aa..fb108b5bf 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:-1} +BUILD=${BUILD:-2} # 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 2fc42be4c..8f4356924 100644 --- a/source/n/NetworkManager/conf.d/00-dhcp-client.conf +++ b/source/n/NetworkManager/conf.d/00-dhcp-client.conf @@ -1,7 +1,8 @@ [main] # Choose a DHCP client below. Upstream recommends internal, but results may vary. -# dhcpcd is the DHCP client usually used by Slackware: -dhcp=dhcpcd +# 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 # 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: |