--- a/bin/update Wed Mar 21 17:04:21 2012 +0200
+++ b/bin/update Wed Mar 21 17:11:00 2012 +0200
@@ -96,8 +96,8 @@
# List of actual domains used; will be linked to $DOMAIN_BASE
DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi)
-# Names of dhcp hosts files
-DHCP_HOSTS=(paivola veturi verstas)
+# Names of dhcp conf files
+DHCP_CONFS=(paivola veturi verstas)
## Operate!
# these functions are all defined in lib/update.operations
@@ -190,14 +190,15 @@
# Update $DHCP files from $DATA/dhcp
function run_dhcp {
- log "Linking DHCP hosts..."
- for hosts in "${DHCP_HOSTS[@]}"; do
- # hosts base
- link_dhcp_hosts $hosts
- check_dhcp_hosts $hosts
+ log "Linking DHCP configs..."
+ for conf in "${DHCP_CONFS[@]}"; do
+ # conf base
+ check_dhcp_conf $conf
+ link_dhcp_conf $conf
done
log "Testing dhcp..."
+ # this is partially redundant with the above check_dhcp_hosts, but doesn't matter
check_dhcp
}