Try and move YP config to an example hook script.

diff --git a/configure b/configure
index 57b1b69aa71e9f76563c2d2900d6b6af3e6713fd..4989c6a66719e7589d33b27bd265ace31762fdb9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1250,7 +1250,7 @@ if ! $HOOKSET; then
                        echo "YPDOMAIN_SUFFIX=" >>$CONFIG_MK
                fi
                echo "$YPBIND ($YPHOOK${YPOS:+ }$YPOS)"
-               HOOKS="$HOOKS${HOOKS:+ }$YPHOOK"
+               EGHOOKS="$EGHOOKS${EGHOOKS:+ }$YPHOOK"
        else
                echo "not found"
        fi
@@ -1275,9 +1275,28 @@ if cd dhcpcd-hooks; then
                        esac
                fi
        done
+       for x in $EGHOOKSCRIPTS; do
+               printf "Finding example hook $x ... "
+               for h in [0-9][0-9]"-$x" \
+                   [0-9][0-9]"-$x.sh" \
+                   [0-9][0-9]"-$x.conf"
+               do
+                       [ -e "$h" ] && break
+               done
+               if [ ! -e "$h" ]; then
+                       echo "no"
+               else
+                       echo "$h"
+                       case " $EGHOOKS " in
+                       *" $h "*)       ;;
+                       *)              EGHOOKS="$EGHOOKS${EGHOOKS:+ }$h";;
+                       esac
+               fi
+       done
        cd ..
 fi
 echo "HOOKSCRIPTS=     $HOOKS" >>$CONFIG_MK
+echo "EGHOOKSCRIPTS=   $EGHOOKS" >>$CONFIG_MK
 
 echo
 echo "   SYSCONFDIR =          $SYSCONFDIR"
@@ -1285,10 +1304,11 @@ echo "   SBINDIR =              $SBINDIR"
 echo "   LIBDIR =              $LIBDIR"
 echo "   LIBEXECDIR =          $LIBEXECDIR"
 echo "   DBDIR =               $DBDIR"
-echo "   RUNDIR =              $RUNDIR"
+echo "   RUNDIR =              $RUNDIR"        
 echo "   MANDIR =              $MANDIR"
 echo "   DATADIR =             $DATADIR"
 echo "   HOOKSCRIPTS = $HOOKS"
+echo "   EGHOOKSCRIPTS =       $EGHOOKS"
 echo
 
 rm -f dhcpcd tests/test

diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index a5a3e7682c37e36098f86c2582a468f11a7e9168..655678c2fc18dfad4f13aa6220c40c40b50c10af 100644 (file)
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -13,6 +13,7 @@ FILESDIR=     ${DATADIR}/dhcpcd/hooks
 FILES=         10-wpa_supplicant
 FILES+=                15-timezone
 FILES+=                29-lookup-hostname
+FILES+=                ${EGHOOKSCRIPTS}
 
 50-ypbind: 50-ypbind.in
        ${SED} \
@@ -20,7 +21,7 @@ FILES+=               29-lookup-hostname
                -e 's:@YPDOMAIN_SUFFIX@:${YPDOMAIN_SUFFIX}:g' \
                50-ypbind.in > $@
 
-all: ${HOOKSCRIPTS}
+all: ${HOOKSCRIPTS} ${EGHOOKSCRIPTS}
 
 clean:
        rm -f 50-ypbind
@@ -31,7 +32,7 @@ proginstall: ${HOOKSCRIPTS}
        # We need to remove the old MTU change script if we at all can.
        rm -f ${DESTDIR}${SCRIPTSDIR}/10-mtu
 
-eginstall:
+eginstall: ${EGHOOKSCRIPTS}
        ${INSTALL} -d ${DESTDIR}${FILESDIR}
        ${INSTALL} -m ${NONBINMODE} ${FILES} ${DESTDIR}${FILESDIR}