[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-32-g2c50302

[Andrew Pollock]

The following commit has been merged in the master branch:
commit ebf14fed9162d32cbef115b5680946984f2bdeac
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Aug 30 21:39:27 2009 -0700

    Corrected syntax error

diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 26a19dc..4db88ca 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -1,9 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
 #
 # Inspiration stolen from the fetchmail* packages. Thanks Henrique!
 #
 #
 
+set -e
+
 #DEBHELPER#
 
 case "$1" in
@@ -71,12 +73,12 @@ fi
 
 # If we're upgrading from dhcp3, copy the config and leases over to the new
 # locations
-if [ -z "$2" ] 
+if [ -z "$2" ]; then
 	if [ -f /etc/dhcp3/dhcpd.conf ]; then
 		cp /etc/dhcp3/dhcpd.conf /etc/dhcp/dhcpd.conf
-	if
+	fi
 	if [ -f /var/lib/dhcp3/dhcpd.leases ]; then
-		cp /var/lib/dhcp3/dhcpd.leases
+		cp /var/lib/dhcp3/dhcpd.leases /var/lib/dhcp/dhcpd.leases
 	fi
 fi
 

-- 
ISC DHCP packaging for Debian