From 6669f020b17779cc6767a30ca2e7c51de766b9b8 Mon Sep 17 00:00:00 2001
From: Joachim Tingvold <joachim@tingvold.com>
Date: Sat, 21 Mar 2015 22:48:32 +0100
Subject: Spring cleaning for TG15. Preparing for DHCP6. Cleanup of old files.

---
 bootstrap/make-dhcpd-include.pl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'bootstrap/make-dhcpd-include.pl')

diff --git a/bootstrap/make-dhcpd-include.pl b/bootstrap/make-dhcpd-include.pl
index ded5551..86673cb 100755
--- a/bootstrap/make-dhcpd-include.pl
+++ b/bootstrap/make-dhcpd-include.pl
@@ -5,9 +5,9 @@ $base = $ARGV[0] if $#ARGV > -1;
 $base .= "/" if not $base =~ m/\/$/ and not $base eq "";
 
 my $dhcpd_base = $base . "dhcp/";
-my $includeconfig = $dhcpd_base . "generated-include.conf";
+my $includeconfig = $dhcpd_base . "v4-generated-include.conf";
 
-my $glob = $dhcpd_base . "conf.d/*.conf";
+my $glob = $dhcpd_base . "conf-v4/*.conf";
 my @configs = glob($glob);
 
 open CONF, ">" . $includeconfig or die ( $! . " " . $includeconfig);
@@ -16,3 +16,15 @@ foreach my $config ( @configs )
 	print CONF "include \"" . $config . "\";\n";
 }
 close CONF;
+
+$includeconfig = $dhcpd_base . "v6-generated-include.conf";
+
+my $glob = $dhcpd_base . "conf-v6/*.conf";
+my @configs = glob($glob);
+
+open CONF, ">" . $includeconfig or die ( $! . " " . $includeconfig);
+foreach my $config ( @configs )
+{
+	print CONF "include \"" . $config . "\";\n";
+}
+close CONF;
\ No newline at end of file
-- 
cgit v1.2.3