--- a/lib/pvl/hosts/dhcp.sh Sun Mar 01 19:54:20 2015 +0200
+++ b/lib/pvl/hosts/dhcp.sh Sun Mar 01 20:14:12 2015 +0200
@@ -2,16 +2,26 @@
DHCP_CONF=/etc/dhcp/dhcpd.conf
DHCP_SERVICE=isc-dhcp-server
+# absolute path!
+DHCP_INCLUDE="$SRV/var/dhcp"
+
## Generate DHCP hosts config from hosts hosts using pvl.hosts-dhcp
#
# update_hosts_dhcpe $out $src
function update_hosts_dhcp {
local out="$1"
local src="$2"
- local srcs=($src/*)
+ local srcs=
local msg="$out: Generating DHCP hosts: $src"
- if apply_check "$out" "${srcs[@]}"; then
+ # src can be either a dir with symlinks, or a symlink
+ if [ -d "$src" ]; then
+ srcs=$(list "$src")
+ else
+ srcs="$src"
+ fi
+
+ if apply_check "$out" $src $srcs; then
log_skip "$msg"
else
log_apply "$msg"
@@ -34,7 +44,7 @@
log_apply "$msg"
apply_cmd "$out" $OPT/bin/pvl.dhcp-conf \
- --include-path=$VAR/dhcp \
+ --include-path=$DHCP_INCLUDE \
"$src"
fi
}