dhcp: Create local configuration file.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Jul 2010 15:50:04 +0000 (17:50 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Jul 2010 15:50:04 +0000 (17:50 +0200)
config/rootfiles/common/configroot
html/cgi-bin/dhcp.cgi
lfs/configroot

index 12d3ddd..d047104 100644 (file)
@@ -22,6 +22,7 @@ var/ipfire/ddns
 var/ipfire/dhcp
 #var/ipfire/dhcp/advoptions
 #var/ipfire/dhcp/advoptions-list
+#var/ipfire/dhcp/dhcpd.conf.local
 #var/ipfire/dhcp/fixleases
 #var/ipfire/dhcp/settings
 var/ipfire/dhcpc
index 29f1a28..fcf42de 100644 (file)
@@ -1199,6 +1199,7 @@ sub buildconf {
            $key++;
        }
     }
+    print FILE "include ${General::swroot}/dhcp/dhcpd.conf.local\n";
     close FILE;
     if ( $dhcpsettings{"ENABLE_GREEN"} eq 'on' || $dhcpsettings{"ENABLE_BLUE"} eq 'on' ) {system '/usr/local/bin/dhcpctrl enable >/dev/null 2>&1';}
     else {system '/usr/local/bin/dhcpctrl disable >/dev/null 2>&1';}
index c337ab0..544bb25 100644 (file)
@@ -63,7 +63,7 @@ $(TARGET) :
        # Touch empty files
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
-           dhcp/fixleases dhcp/advoptions dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+           dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
            isdn/settings mac/settings main/disable_nf_sip main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \