Fixed for Debian 6 support

textdrive · Feb 11, 2011 · 86c359c · 86c359c
1 parent 9c9f8aa
commit 86c359c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/dhcpd/config-debian-linux-3.1-* → dhcpd/config-debian-linux-3.1-5.9 b/dhcpd/config-debian-linux-3.1-* → dhcpd/config-debian-linux-3.1-5.9
diff --git a/dhcpd/config-debian-linux-6.0-* b/dhcpd/config-debian-linux-6.0-*
@@ -0,0 +1,16 @@
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+pid_file=/var/run/dhcpd.pid
+dhcpd_path=/usr/sbin/dhcpd
+lease_file=/var/lib/dhcp/dhcpd.leases
+lease_sort=0
+dhcpd_nocols=5
+lease_tz=0
+start_cmd=/etc/init.d/isc-dhcp-server start
+stop_cmd=/etc/init.d/isc-dhcp-server stop
+restart_cmd=/etc/init.d/isc-dhcp-server restart
+show_ip=0
+show_mac=0
+group_name=0
+display_max=100
+desc_name=0
+interfaces_type=debian
diff --git a/dhcpd/edit_iface.cgi b/dhcpd/edit_iface.cgi
@@ -35,7 +35,12 @@ elsif ($config{'interfaces_type'} eq 'suse') {
 	$iface = $dhcpd{'DHCPD_INTERFACE'};
 	}
 elsif ($config{'interfaces_type'} eq 'debian') {
-	if (-r "/etc/default/dhcp") {
+	if (-r "/etc/default/isc-dhcp-server") {
+		# Debian 6+ uses a new environment file
+		&read_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
+		$iface = $dhcpd{'INTERFACES'};
+		}
+	elsif (-r "/etc/default/dhcp") {
 		# New debian uses an environment file
 		&read_env_file("/etc/default/dhcp", \%dhcpd);
 		$iface = $dhcpd{'INTERFACES'};

diff --git a/dhcpd/save_iface.cgi b/dhcpd/save_iface.cgi
@@ -54,7 +54,13 @@ elsif ($config{'interfaces_type'} eq 'suse') {
 	&write_env_file("/etc/sysconfig/dhcpd", \%dhcpd);
 	}
 elsif ($config{'interfaces_type'} eq 'debian') {
-	if (-r "/etc/default/dhcp") {
+	if (-r "/etc/default/isc-dhcp-server") {
+		# Write to Debian 6.0 environment file
+		&read_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
+		$dhcpd{'INTERFACES'} = $iface;
+		&write_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
+		}
+	elsif (-r "/etc/default/dhcp") {
 		# Write to Debian environment file
 		&read_env_file("/etc/default/dhcp", \%dhcpd);
 		$dhcpd{'INTERFACES'} = $iface;
@@ -76,7 +82,7 @@ elsif ($config{'interfaces_type'} eq 'debian') {
 				$lref->[$i] = "INTERFACES=\"$iface\"";
 				}
 			}
-		&flush_file_lines();
+		&flush_file_lines("/etc/init.d/dhcp");
 		}
 	}
 elsif ($config{'interfaces_type'} eq 'caldera') {
@@ -93,6 +99,5 @@ elsif ($config{'interfaces_type'} eq 'gentoo') {
 	&write_env_file("/etc/conf.d/dhcp", \%dhcp);
 	}
 
-
 &redirect("");