Sun Nov 4 01:48:41 PDT 2012

1 files changed, 9 insertions, 13 deletions

diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install
index 5302be4b5..2bcd9ea82 100644
--- a/extra/dhcp/dhcp.install
+++ b/extra/dhcp/dhcp.install
@@ -1,18 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
+  [[ -f var/lib/dhcp/dhcpd.leases ]] || : >var/lib/dhcp/dhcpd.leases
+  [[ -f var/lib/dhcp/dhcpd6.leases ]] || : >var/lib/dhcp/dhcpd6.leases
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if (( $(vercmp $2 4.2.4.2) < 0 )); then
+    echo ">>> Lease directory moved from /var/state/dhcp"
+    echo "    to /var/lib/dhcp. Move your old lease files"
+    echo "    if you want to keep using them."
+  fi
+
+  post_install
 }