summaryrefslogtreecommitdiffstats
path: root/source/n/NetworkManager/conf.d/00-dhcp-client.conf
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-09-13 18:04:35 +0000
committer Eric Hameleers <alien@slackware.com>2021-09-14 09:03:52 +0200
commit8f7b6e56d5075e27771a02fbbcfe954c91ecb893 (patch)
tree67f7366d18c8f320d9914a1a929bb430c93b8eb4 /source/n/NetworkManager/conf.d/00-dhcp-client.conf
parenta6160c7f56c451aa827678063c6ce95b7b4e404e (diff)
downloadcurrent-8f7b6e56d5075e27771a02fbbcfe954c91ecb893.tar.gz
current-8f7b6e56d5075e27771a02fbbcfe954c91ecb893.tar.xz
Mon Sep 13 18:04:35 UTC 202120210913180435
a/btrfs-progs-5.14-x86_64-1.txz: Upgraded. a/kernel-firmware-20210912_7160358-noarch-1.txz: Upgraded. a/kernel-generic-5.14.3-x86_64-1.txz: Upgraded. a/kernel-huge-5.14.3-x86_64-1.txz: Upgraded. a/kernel-modules-5.14.3-x86_64-1.txz: Upgraded. ap/vim-8.2.3435-x86_64-1.txz: Upgraded. d/bison-3.8.1-x86_64-1.txz: Upgraded. d/ccache-4.4.1-x86_64-1.txz: Upgraded. d/gdb-11.1-x86_64-1.txz: Upgraded. d/kernel-headers-5.14.3-x86-1.txz: Upgraded. k/kernel-source-5.14.3-noarch-1.txz: Upgraded. kde/latte-dock-0.10.2-x86_64-1.txz: Upgraded. l/gd-2.3.3-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_7-x86_64-1.txz: Upgraded. l/libedit-20210910_3.1-x86_64-1.txz: Upgraded. l/libexif-0.6.23-x86_64-1.txz: Upgraded. l/pango-1.48.10-x86_64-1.txz: Upgraded. n/NetworkManager-1.32.10-x86_64-2.txz: Rebuilt. 00-dhcp-client.conf: Add the --noconfigure option to dhcpcd, or else the network won't return after suspend/resume. Thanks to marav. n/ethtool-5.14-x86_64-1.txz: Upgraded. n/mutt-2.1.3-x86_64-1.txz: Upgraded. n/wget2-2.0.0-x86_64-1.txz: Added. xap/vim-gvim-8.2.3435-x86_64-1.txz: Upgraded. xfce/thunar-4.16.9-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/NetworkManager/conf.d/00-dhcp-client.conf')
-rw-r--r--source/n/NetworkManager/conf.d/00-dhcp-client.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/n/NetworkManager/conf.d/00-dhcp-client.conf b/source/n/NetworkManager/conf.d/00-dhcp-client.conf
index 2fc42be4..8f435692 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: