From ba68f3723893fc7c2d27da6c255982accde43259 Mon Sep 17 00:00:00 2001
From: Joachim Tingvold <joachim@tingvold.com>
Date: Sun, 22 Mar 2015 02:53:09 +0100
Subject: Minor cleanups.

---
 bootstrap/make-dhcpd.pl  | 8 +-------
 bootstrap/make-dhcpd6.pl | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/make-dhcpd.pl b/bootstrap/make-dhcpd.pl
index d5f49cc..04def7b 100755
--- a/bootstrap/make-dhcpd.pl
+++ b/bootstrap/make-dhcpd.pl
@@ -41,12 +41,6 @@ if ( not -f $dhcpd_conf )
 		print STDERR "Creating file " . $dhcpd_conf . "\n";
 		open DHCPDFILE, ">" . $dhcpd_conf or die ( $! . " " . $dhcpd_conf);
 
-		my $network = Net::IP->new($v4_net)->ip();
-		my $netmask = Net::IP->new($v4_net)->mask();
-		(my $first = NetAddr::IP->new($v4_net)->nth(3)) =~ s/\/[0-9]{1,2}//; # we reserve the three first addresses 
-		(my $last = NetAddr::IP->new($v4_net)->last()) =~ s/\/[0-9]{1,2}//;
-		(my $gw = NetAddr::IP->new($v4_net)->first()) =~ s/\/[0-9]{1,2}//;
-
 		print DHCPDFILE <<"EOF";
 # GENERATED BY make-dhcpd.pl
 
@@ -145,7 +139,7 @@ option space AP;
 option AP.server-address code 241 = array of ip-address;
 set vendor-string = option vendor-class-identifier;
 
-class "cisco-aps" {
+class "access-points" {
        match if substring (option vendor-class-identifier, 0, 8) = "Access Point";
        vendor-option-space AP;
        option AP.server-address $nms::config::wlc1;
diff --git a/bootstrap/make-dhcpd6.pl b/bootstrap/make-dhcpd6.pl
index 328190a..bd79dac 100755
--- a/bootstrap/make-dhcpd6.pl
+++ b/bootstrap/make-dhcpd6.pl
@@ -21,7 +21,7 @@ my $dhcpd_wlc_conf = $dhcpd_base . "v6-wlc.conf";
 my $dhcpd_voip_conf = $dhcpd_base . "v6-voip.conf";
 
 my $sec_net = Net::IP->new($nms::config::sec_net_v6)->short();
-my ($sec_first, $sec_last) = ("5000", "9999");
+my ($sec_first, $sec_last) = ("8000", "9999");
 
 # Create PXE-boot configuration file for DHCP
 if ( not -f $dhcpd_conf )
@@ -133,7 +133,7 @@ option space AP;
 option AP.server-address code 241 = array of ip-address;
 set vendor-string = option vendor-class-identifier;
 
-class "cisco-aps" {
+class "access-points" {
        match if substring (option vendor-class-identifier, 0, 8) = "Access Point";
        vendor-option-space AP;
        option AP.server-address $nms::config::wlc1;
-- 
cgit v1.2.3