Grudgingly accede to the vocal minority that dhcpcd should not attempt to

start wpa_supplicant by default on a wireless interface, even if a wpa_ctrl interface is configured for it and wpa_supplicant is not yet started.

diff --git a/Makefile b/Makefile
index e4a25668790526f24c268241ee8935e943ed7398..cbd09bc90b57ceb4a2008e6076a049971178ffd8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ SUBDIRS=      dhcpcd-hooks ${MKDIRS}
 SED_RUNDIR=            -e 's:@RUNDIR@:${RUNDIR}:g'
 SED_DBDIR=             -e 's:@DBDIR@:${DBDIR}:g'
 SED_LIBDIR=            -e 's:@LIBDIR@:${LIBDIR}:g'
+SED_DATADIR=           -e 's:@DATADIR@:${DATADIR}:g'
 SED_HOOKDIR=           -e 's:@HOOKDIR@:${HOOKDIR}:g'
 SED_SERVICEEXISTS=     -e 's:@SERVICEEXISTS@:${SERVICEEXISTS}:g'
 SED_SERVICECMD=                -e 's:@SERVICECMD@:${SERVICECMD}:g'
@@ -67,7 +68,7 @@ CLEANFILES+=  *.tar.xz
 
 .in:
        ${SED} ${SED_RUNDIR} ${SED_DBDIR} ${SED_LIBDIR} ${SED_HOOKDIR} \
-               ${SED_SYS} ${SED_SCRIPT} \
+               ${SED_SYS} ${SED_SCRIPT} ${SED_DATADIR} \
                ${SED_SERVICEEXISTS} ${SED_SERVICECMD} ${SED_SERVICESTATUS} \
                $< > $@
 

diff --git a/README b/README
index bfc31b1daadbc335901fd66a672b7e09a60f091e..bbc6e0398059709ad0345dbc31195de7a8c9747d 100644 (file)
--- a/README
+++ b/README
@@ -120,11 +120,10 @@ gmake-4 or any BSD make.
 Hooks
 -----
 Not all the hooks in dhcpcd-hooks are installed by default.
-By default we install 01-test, 02-dump, 10-mtu, 10-wpa_supplicant,
-15-timezone, 20-resolv.conf, 29-lookup-hostname and 30-hostname.
-The other hooks, 15-timezone, 29-lookup-hostname are installed
-to $(datadir)/dhcpcd/hooks by default and need to be copied to
-$(libexecdir)/dhcpcd-hooks for use.
+By default we install 01-test, 02-dump, 10-mtu, 20-resolv.conf and 30-hostname.
+The other hooks, 10-wpa_supplicant, 15-timezone, 29-lookup-hostname
+are installed to $(datadir)/dhcpcd/hooks by default and need to be
+copied to $(libexecdir)/dhcpcd-hooks for use.
 The configure program attempts to find hooks for systems you have installed.
 To add more simply
 ./configure -with-hook=ntp.conf

diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index 5f3087b6d43b5acba8afa0c1a264cf649f8bfe81..a5a3e7682c37e36098f86c2582a468f11a7e9168 100644 (file)
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -4,13 +4,14 @@ include ${TOP}/iconfig.mk
 
 SCRIPTSDIR=    ${LIBEXECDIR}/dhcpcd-hooks
 SCRIPTS=       01-test 02-dump
-SCRIPTS+=      10-wpa_supplicant 20-resolv.conf
+SCRIPTS+=      20-resolv.conf
 SCRIPTS+=      30-hostname
 SCRIPTS+=      ${HOOKSCRIPTS}
 
 # Some hooks should not be installed by default
 FILESDIR=      ${DATADIR}/dhcpcd/hooks
-FILES=         15-timezone
+FILES=         10-wpa_supplicant
+FILES+=                15-timezone
 FILES+=                29-lookup-hostname
 
 50-ypbind: 50-ypbind.in

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 8f7b19167155612b9b27ee2460a2647773e25a71..5b8ab1604115b58da239eeae215e9cd722191cf8 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 4, 2015
+.Dd December 22, 2015
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -205,8 +205,6 @@ in a lexical order.
 The default installation supplies the scripts
 .Pa 01-test ,
 .Pa 02-dump ,
-.Pa 10-wpa_supplicant ,
-.Pa 15-timezone ,
 .Pa 20-resolv.conf
 and
 .Pa 30-hostname .
@@ -218,6 +216,19 @@ See
 for details on how these scripts work.
 .Nm
 currently ignores the exit code of the script.
+.Pp
+More scripts are supplied in
+.Pa @DATADIR@/dhcpcd/hooks
+and need to be copied to
+.Pa @HOOKDIR@
+if you intend to use them.
+For example, you could install
+.Pa 10-wpa_supplicant
+so that
+.Nm
+can ensure that
+.Xr wpa_supplicant 8
+is always running on a hot-plugged wireless interface.
 .Ss Fine tuning
 You can fine-tune the behaviour of
 .Nm
@@ -377,7 +388,8 @@ If
 is not running, then it starts up as normal.
 This may also cause
 .Xr wpa_supplicant 8
-to reload its configuration for each interface as well.
+to reload its configuration for each interface as well if the
+relevant hook script has been installed.
 .It Fl N , Fl Fl renew Op Ar interface
 Notifies
 .Nm
@@ -391,8 +403,6 @@ Unlike the
 .Fl n , Fl Fl rebind
 option above, the configuration for
 .Nm
-and
-.Xr wpa_supplicant 8
 is not reloaded.
 .It Fl o , Fl Fl option Ar option
 Request the DHCP