mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
76fc4757ac
Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
26 lines
796 B
Diff
26 lines
796 B
Diff
From d968ff96e1e4354c591e49fe79b4f4ce0e553f61 Mon Sep 17 00:00:00 2001
|
|
From: Robby Workman <rworkman@slackware.com>
|
|
Date: Sun, 11 Aug 2013 23:12:57 -0500
|
|
Subject: [PATCH 2/2] dhcpcd.conf: Don't invoke wpa_supplicant by default
|
|
|
|
Slackware's network init script (rc.inet1) and/or
|
|
NetworkManager itself handles this just fine.
|
|
---
|
|
dhcpcd.conf | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/dhcpcd.conf b/dhcpcd.conf
|
|
index 349c6f2..30aacca 100644
|
|
--- a/dhcpcd.conf
|
|
+++ b/dhcpcd.conf
|
|
@@ -30,3 +30,7 @@ require dhcp_server_identifier
|
|
# A hook script is provided to lookup the hostname if not set by the DHCP
|
|
# server, but it should not be run by default.
|
|
nohook lookup-hostname
|
|
+
|
|
+# We run wpa_supplicant from rc.inet1 and/or NM handles it on its own
|
|
+nohook wpa_supplicant
|
|
+
|
|
--
|
|
1.8.3.2
|
|
|