diff --git a/openWRT23_install.sh b/openWRT23_install.sh
index a37fc5f..e776430 100644
--- a/openWRT23_install.sh
+++ b/openWRT23_install.sh
@@ -462,10 +462,13 @@ echo 'Please wait ....'
 echo
 echo 'On Error enter logread'
 echo
-/etc/init.d/dnsmasq stop >> install.log
-/etc/init.d/dnsmasq disable >> install.log
-opkg update >> install.log
-opkg remove dnsmasq >> install.log
+if [ "$dnsmasq_inst" != "" ]
+	then
+		/etc/init.d/dnsmasq stop >> install.log
+		/etc/init.d/dnsmasq disable >> install.log
+		opkg update >> install.log
+		opkg remove dnsmasq >> install.log
+fi
 opkg update >> install.log
 if [ "$(opkg list-upgradable)" != "" ]
 	then
@@ -20687,236 +20690,236 @@ view_config
 
 
 set_dhcp() {
+if [ "$dnsmasq_inst" != "" ]
+	then
+  		uci delete dhcp.@dnsmasq[-1] >/dev/
+    		processes=$(uci commit && reload_config)
+		wait $processes >/dev/null
+
+		uci set dhcp.Blacklist=dnsmasq	
+		uci set dhcp.Blacklist.domainneeded='1'
+		uci set dhcp.Blacklist.boguspriv='1'
+		uci set dhcp.Blacklist.filterwin2k='0'
+		uci set dhcp.Blacklist.localise_queries='1'
+		uci set dhcp.Blacklist.rebind_protection='1'
+		uci set dhcp.Blacklist.rebind_localhost='1'
+		uci set dhcp.Blacklist.expandhosts='1'
+		uci set dhcp.Blacklist.nonegcache='0'
+		uci set dhcp.Blacklist.authoritative='1'
+		uci set dhcp.Blacklist.readethers='1'
+		uci set dhcp.Blacklist.nonwildcard='1'
+		uci set dhcp.Blacklist.localservice='1'
+		uci set dhcp.Blacklist.ednspacket_max='1232'
+		uci set dhcp.Blacklist.cachelocal='1'
+		uci set dhcp.Blacklist.cachesize='0'
+		uci set dhcp.Blacklist.queryport=$DNSMASQ_Relay_port
+		uci set dhcp.Blacklist.leasefile='/tmp/dhcp.leases'
+		uci set dhcp.Blacklist.resolvfile='/tmp/resolv.conf.d/resolv.conf.auto'
+		uci set dhcp.Blacklist.confdir='/etc/dnsmasq.d/Blacklist/'
+		uci add_list dhcp.Blacklist.notinterface='br-lan.105'
+		uci add_list dhcp.Blacklist.notinterface='br-lan.106'
+		uci add_list dhcp.Blacklist.notinterface='br-lan.107'
+		uci add_list dhcp.Blacklist.notinterface='br-lan.108'
+		uci add_list dhcp.Blacklist.notinterface='br-lan.110'
+		uci add_list dhcp.Blacklist.notinterface='loopback'
+		uci add_list dhcp.Blacklist.interface='br-lan.104'
+		uci add_list dhcp.Blacklist.interface='br-lan.101' 
+		uci add_list dhcp.Blacklist.interface='br-lan.102'
+		uci add_list dhcp.Blacklist.interface='br-lan.103'
+		uci add_list dhcp.Blacklist.interface='br-lan.1'
+
+		uci set dhcp.Whitelist=dnsmasq
+		uci set dhcp.Whitelist.domainneeded='1'
+		uci set dhcp.Whitelist.boguspriv='1'
+		uci set dhcp.Whitelist.filterwin2k='0'
+		uci set dhcp.Whitelist.localise_queries='1'
+		uci set dhcp.Whitelist.rebind_protection='1'
+		uci set dhcp.Whitelist.rebind_localhost='1'
+		uci set dhcp.Whitelist.expandhosts='1'
+		uci set dhcp.Whitelist.nonegcache='0'
+		uci set dhcp.Whitelist.authoritative='1'
+		uci set dhcp.Whitelist.readethers='1'
+		uci set dhcp.Whitelist.nonwildcard='1'
+		uci set dhcp.Whitelist.localservice='1'
+		uci set dhcp.Whitelist.ednspacket_max='1232'
+		uci set dhcp.Whitelist.cachelocal='1'
+		uci set dhcp.Whitelist.cachesize='0'
+		uci set dhcp.Whitelist.queryport=$DNSMASQ_Relay_port
+		uci set dhcp.Whitelist.leasefile='/tmp/dhcp.leases'
+		uci set dhcp.Whitelist.resolvfile='/tmp/resolv.conf.d/resolv.conf.auto'
+		uci set dhcp.Whitelist.confdir='/etc/dnsmasq.d/Whitelist/'
+		uci add_list dhcp.Whitelist.interface='br-lan.105'
+		uci add_list dhcp.Whitelist.interface='br-lan.106'
+		uci add_list dhcp.Whitelist.interface='br-lan.107'
+		uci add_list dhcp.Whitelist.interface='br-lan.108'
+		uci add_list dhcp.Whitelist.interface='br-lan.110'
+		uci add_list dhcp.Whitelist.interface='loopback'
+		uci add_list dhcp.Whitelist.notinterface='br-lan.104'
+		uci add_list dhcp.Whitelist.notinterface='br-lan.101'
+		uci add_list dhcp.Whitelist.notinterface='br-lan.102'
+		uci add_list dhcp.Whitelist.notinterface='br-lan.103'
+		uci add_list dhcp.Whitelist.notinterface='br-lan.1'
+
+		uci set dhcp.CMOVIE=dhcp
+		uci set dhcp.CMOVIE.interface='CMOVIE'
+		uci set dhcp.CMOVIE.start='20'
+		uci set dhcp.CMOVIE.limit='250'
+		uci set dhcp.CMOVIE.leasetime='24h'
+		uci set dhcp.CMOVIE.netmask='255.255.255.0'
+		uci set dhcp.CMOVIE.domain=$CMOVIE_domain
+		uci set dhcp.CMOVIE.local='/'$CMOVIE_domain'/'
+		uci set dhcp.CMOVIE.instance='Whitelist'
+		#uci add_list dhcp.CMOVIE.dhcp_option='6,'$CMOVIE_ip 
+		uci add_list dhcp.CMOVIE.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.CMOVIE.dhcp_option='3,'$CMOVIE_ip
+		uci add_list dhcp.CMOVIE.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.CMOVIE.dhcp_option='15,'$CMOVIE_domain
+		uci set dhcp.CMOVIE.server=$CMOVIE_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.CONTROL=dhcp
+		uci set dhcp.CONTROL.interface='CONTROL'
+		uci set dhcp.CONTROL.start='10'
+		uci set dhcp.CONTROL.limit='250'
+		uci set dhcp.CONTROL.leasetime='24h'
+		uci set dhcp.CONTROL.netmask='255.255.255.0'	
+		uci set dhcp.CONTROL.domain=$CONTROL_domain
+		uci set dhcp.CONTROL.local='/'$CONTROL_domain'/'
+		uci set dhcp.CONTROL.instance='Blacklist'
+		#uci add_list dhcp.CONTROL.dhcp_option='6,'$CONTROL_ip 
+		uci add_list dhcp.CONTROL.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.CONTROL.dhcp_option='3,'$CONTROL_ip
+		uci add_list dhcp.CONTROL.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.CONTROL.dhcp_option='15,'$CONTROL_domain
+		uci set dhcp.CONTROL.server=$CONTROL_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.ENTERTAIN=dhcp
+		uci set dhcp.ENTERTAIN.interface='ENTERTAIN'
+		uci set dhcp.ENTERTAIN.start='10'
+		uci set dhcp.ENTERTAIN.limit='250'
+		uci set dhcp.ENTERTAIN.leasetime='24h'
+		uci set dhcp.ENTERTAIN.netmask='255.255.255.0'
+		uci set dhcp.ENTERTAIN.domain=$ENTERTAIN_domain
+		uci set dhcp.ENTERTAIN.local='/'$ENTERTAIN_domain'/'
+		uci set dhcp.ENTERTAIN.instance='Whitelist'
+		#uci add_list dhcp.ENTERTAIN.dhcp_option='6,'$ENTERTAIN_ip 
+		uci add_list dhcp.ENTERTAIN.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.ENTERTAIN.dhcp_option='3,'$ENTERTAIN_ip
+		uci add_list dhcp.ENTERTAIN.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.ENTERTAIN.dhcp_option='15,'$ENTERTAIN_domain
+		uci set dhcp.ENTERTAIN.server=$ENTERTAIN_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.GUEST=dhcp
+		uci set dhcp.GUEST.interface='GUEST'
+		uci set dhcp.GUEST.start='10'
+		uci set dhcp.GUEST.limit='250'
+		uci set dhcp.GUEST.leasetime='24h'
+		uci set dhcp.GUEST.netmask='255.255.255.0'
+		uci set dhcp.GUEST.domain=$GUEST_domain
+		uci set dhcp.GUEST.local='/'$GUEST_domain'/'
+		uci set dhcp.GUEST.instance='Whitelist'
+		#uci add_list dhcp.GUEST.dhcp_option='6,'$GUEST_ip 
+		uci add_list dhcp.GUEST.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.GUEST.dhcp_option='3,'$GUEST_ip
+		uci add_list dhcp.GUEST.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.GUEST.dhcp_option='15,'$GUEST_domain
+		uci set dhcp.GUEST.server=$GUEST_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.HCONTROL=dhcp
+		uci set dhcp.HCONTROL.interface='HCONTROL'
+		uci set dhcp.HCONTROL.start='10'
+		uci set dhcp.HCONTROL.limit='250'
+		uci set dhcp.HCONTROL.leasetime='24h'
+		uci set dhcp.HCONTROL.netmask='255.255.255.0'
+		uci set dhcp.HCONTROL.domain=$HCONTROL_domain
+		uci set dhcp.HCONTROL.local='/'$HCONTROL_domain'/'
+		uci set dhcp.HCONTROL.instance='Blacklist'
+		#uci add_list dhcp.HCONTROL.dhcp_option='6,'$HCONTROL_ip 
+		uci add_list dhcp.HCONTROL.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.HCONTROL.dhcp_option='3,'$HCONTROL_ip
+		uci add_list dhcp.HCONTROL.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.HCONTROL.dhcp_option='15,'$HCONTROL_domain
+		uci set dhcp.HCONTROL.server=$HCONTROL_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.INET=dhcp
+		uci set dhcp.INET.interface='INET'
+		uci set dhcp.INET.start='10'
+		uci set dhcp.INET.limit='250'
+		uci set dhcp.INET.leasetime='24h'
+		uci set dhcp.INET.netmask='255.255.255.0'
+		uci set dhcp.INET.domain=$INET_domain
+		uci set dhcp.INET.local='/'$INET_domain'/'
+		uci set dhcp.INET.instance='Blacklist'
+		#uci add_list dhcp.INET.dhcp_option='6,'$INET_ip 
+		uci add_list dhcp.INET.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.INET.dhcp_option='3,'$INET_ip
+		uci add_list dhcp.INET.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.INET.dhcp_option='15,'$INET_domain
+		uci set dhcp.INET.server=$INET_ip'#'$DNSMASQ_Relay_port
+
+		uci del dhcp.lan.ra_slaac
+		uci set dhcp.lan.start='10'
+		uci set dhcp.lan.limit='250'
+		uci set dhcp.lan.leasetime='24h'
+		uci set dhcp.lan.netmask='255.255.255.0'
+		uci set dhcp.lan.domain='lan.local'
+		uci set dhcp.lan.local='/lan.local/'
+		uci set dhcp.lan.instance='Blacklist'
+		uci add_list dhcp.lan.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.lan.dhcp_option='3,'$LAN_ip
+		uci add_list dhcp.lan.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.lan.dhcp_option='15,'$LAN_domain
+		uci set dhcp.lan.server=$LAN_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.SERVER=dhcp
+		uci set dhcp.SERVER.interface='SERVER'
+		uci set dhcp.SERVER.start='10'
+		uci set dhcp.SERVER.limit='250'
+		uci set dhcp.SERVER.leasetime='24h'
+		uci set dhcp.SERVER.netmask='255.255.255.0'
+		uci set dhcp.SERVER.domain=$SERVER_domain
+		uci set dhcp.SERVER.local='/'$SERVER_domain'/'
+		uci set dhcp.SERVER.instance='Blacklist'
+		#uci add_list dhcp.SERVER.dhcp_option='6,'$SERVER_ip 
+		uci add_list dhcp.SERVER.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.SERVER.dhcp_option='3,'$SERVER_ip
+		uci add_list dhcp.SERVER.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.SERVER.dhcp_option='15,'$SERVER_domain
+		uci set dhcp.SERVER.server=$SERVER_ip'#'$DNSMASQ_Relay_port
+
+
+		uci set dhcp.TELEKOM=dhcp
+		uci set dhcp.TELEKOM.interface='TELEKOM'
+		uci set dhcp.TELEKOM.start='10'
+		uci set dhcp.TELEKOM.limit='250'
+		uci set dhcp.TELEKOM.leasetime='24h'
+		uci set dhcp.TELEKOM.netmask='255.255.255.0'
+		uci set dhcp.TELEKOM.domain=$TELEKOM_domain
+		uci set dhcp.TELEKOM.local='/'$TELEKOM_domain'/'
+		uci set dhcp.TELEKOM.instance='Whitelist'
+		#uci add_list dhcp.TELEKOM.dhcp_option='6,'$TELEKOM_ip 
+		uci add_list dhcp.TELEKOM.dhcp_option='6,'$INET_GW 
+		uci add_list dhcp.TELEKOM.dhcp_option='3,'$TELEKOM_ip
+		uci add_list dhcp.TELEKOM.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.TELEKOM.dhcp_option='15,'$TELEKOM_domain
+		uci set dhcp.TELEKOM.server=$TELEKOM_ip'#'$DNSMASQ_Relay_port
+
+		uci set dhcp.VOICE=dhcp
+		uci set dhcp.VOICE.interface='VOICE'
+		uci set dhcp.VOICE.start='10'
+		uci set dhcp.VOICE.limit='250'
+		uci set dhcp.VOICE.leasetime='24h'
+		uci set dhcp.VOICE.netmask='255.255.255.0'
+		uci set dhcp.VOICE.domain=$VOICE_domain	
+		uci set dhcp.VOICE.local='/'$VOICE_domain'/'
+		uci set dhcp.VOICE.instance='Whitelist'
+		#uci add_list dhcp.VOICE.dhcp_option='6,'$VOICE_ip 
+		uci add_list dhcp.VOICE.dhcp_option='6,'$INET_GW 	
+		uci add_list dhcp.VOICE.dhcp_option='3,'$VOICE_ip
+		uci add_list dhcp.VOICE.dhcp_option='42,'$INET_GW 
+		uci add_list dhcp.VOICE.dhcp_option='15,'$VOICE_domain
+		uci set dhcp.VOICE.server=$VOICE_ip'#'$DNSMASQ_Relay_port
 
-uci delete dhcp.@dnsmasq[-1] >/dev/null
-processes=$(uci commit && reload_config)
-wait $processes >/dev/null
-
-
-
-uci set dhcp.Blacklist=dnsmasq
-uci set dhcp.Blacklist.domainneeded='1'
-uci set dhcp.Blacklist.boguspriv='1'
-uci set dhcp.Blacklist.filterwin2k='0'
-uci set dhcp.Blacklist.localise_queries='1'
-uci set dhcp.Blacklist.rebind_protection='1'
-uci set dhcp.Blacklist.rebind_localhost='1'
-uci set dhcp.Blacklist.expandhosts='1'
-uci set dhcp.Blacklist.nonegcache='0'
-uci set dhcp.Blacklist.authoritative='1'
-uci set dhcp.Blacklist.readethers='1'
-uci set dhcp.Blacklist.nonwildcard='1'
-uci set dhcp.Blacklist.localservice='1'
-uci set dhcp.Blacklist.ednspacket_max='1232'
-uci set dhcp.Blacklist.cachelocal='1'
-uci set dhcp.Blacklist.cachesize='0'
-uci set dhcp.Blacklist.queryport=$DNSMASQ_Relay_port
-uci set dhcp.Blacklist.leasefile='/tmp/dhcp.leases'
-uci set dhcp.Blacklist.resolvfile='/tmp/resolv.conf.d/resolv.conf.auto'
-uci set dhcp.Blacklist.confdir='/etc/dnsmasq.d/Blacklist/'
-uci add_list dhcp.Blacklist.notinterface='br-lan.105'
-uci add_list dhcp.Blacklist.notinterface='br-lan.106'
-uci add_list dhcp.Blacklist.notinterface='br-lan.107'
-uci add_list dhcp.Blacklist.notinterface='br-lan.108'
-uci add_list dhcp.Blacklist.notinterface='br-lan.110'
-uci add_list dhcp.Blacklist.notinterface='loopback'
-uci add_list dhcp.Blacklist.interface='br-lan.104'
-uci add_list dhcp.Blacklist.interface='br-lan.101' 
-uci add_list dhcp.Blacklist.interface='br-lan.102'
-uci add_list dhcp.Blacklist.interface='br-lan.103'
-uci add_list dhcp.Blacklist.interface='br-lan.1'
-
-uci set dhcp.Whitelist=dnsmasq
-uci set dhcp.Whitelist.domainneeded='1'
-uci set dhcp.Whitelist.boguspriv='1'
-uci set dhcp.Whitelist.filterwin2k='0'
-uci set dhcp.Whitelist.localise_queries='1'
-uci set dhcp.Whitelist.rebind_protection='1'
-uci set dhcp.Whitelist.rebind_localhost='1'
-uci set dhcp.Whitelist.expandhosts='1'
-uci set dhcp.Whitelist.nonegcache='0'
-uci set dhcp.Whitelist.authoritative='1'
-uci set dhcp.Whitelist.readethers='1'
-uci set dhcp.Whitelist.nonwildcard='1'
-uci set dhcp.Whitelist.localservice='1'
-uci set dhcp.Whitelist.ednspacket_max='1232'
-uci set dhcp.Whitelist.cachelocal='1'
-uci set dhcp.Whitelist.cachesize='0'
-uci set dhcp.Whitelist.queryport=$DNSMASQ_Relay_port
-uci set dhcp.Whitelist.leasefile='/tmp/dhcp.leases'
-uci set dhcp.Whitelist.resolvfile='/tmp/resolv.conf.d/resolv.conf.auto'
-uci set dhcp.Whitelist.confdir='/etc/dnsmasq.d/Whitelist/'
-uci add_list dhcp.Whitelist.interface='br-lan.105'
-uci add_list dhcp.Whitelist.interface='br-lan.106'
-uci add_list dhcp.Whitelist.interface='br-lan.107'
-uci add_list dhcp.Whitelist.interface='br-lan.108'
-uci add_list dhcp.Whitelist.interface='br-lan.110'
-uci add_list dhcp.Whitelist.interface='loopback'
-uci add_list dhcp.Whitelist.notinterface='br-lan.104'
-uci add_list dhcp.Whitelist.notinterface='br-lan.101'
-uci add_list dhcp.Whitelist.notinterface='br-lan.102'
-uci add_list dhcp.Whitelist.notinterface='br-lan.103'
-uci add_list dhcp.Whitelist.notinterface='br-lan.1'
-
-uci set dhcp.CMOVIE=dhcp
-uci set dhcp.CMOVIE.interface='CMOVIE'
-uci set dhcp.CMOVIE.start='20'
-uci set dhcp.CMOVIE.limit='250'
-uci set dhcp.CMOVIE.leasetime='24h'
-uci set dhcp.CMOVIE.netmask='255.255.255.0'
-uci set dhcp.CMOVIE.domain=$CMOVIE_domain
-uci set dhcp.CMOVIE.local='/'$CMOVIE_domain'/'
-uci set dhcp.CMOVIE.instance='Whitelist'
-#uci add_list dhcp.CMOVIE.dhcp_option='6,'$CMOVIE_ip 
-uci add_list dhcp.CMOVIE.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.CMOVIE.dhcp_option='3,'$CMOVIE_ip
-uci add_list dhcp.CMOVIE.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.CMOVIE.dhcp_option='15,'$CMOVIE_domain
-uci set dhcp.CMOVIE.server=$CMOVIE_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.CONTROL=dhcp
-uci set dhcp.CONTROL.interface='CONTROL'
-uci set dhcp.CONTROL.start='10'
-uci set dhcp.CONTROL.limit='250'
-uci set dhcp.CONTROL.leasetime='24h'
-uci set dhcp.CONTROL.netmask='255.255.255.0'
-uci set dhcp.CONTROL.domain=$CONTROL_domain
-uci set dhcp.CONTROL.local='/'$CONTROL_domain'/'
-uci set dhcp.CONTROL.instance='Blacklist'
-#uci add_list dhcp.CONTROL.dhcp_option='6,'$CONTROL_ip 
-uci add_list dhcp.CONTROL.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.CONTROL.dhcp_option='3,'$CONTROL_ip
-uci add_list dhcp.CONTROL.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.CONTROL.dhcp_option='15,'$CONTROL_domain
-uci set dhcp.CONTROL.server=$CONTROL_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.ENTERTAIN=dhcp
-uci set dhcp.ENTERTAIN.interface='ENTERTAIN'
-uci set dhcp.ENTERTAIN.start='10'
-uci set dhcp.ENTERTAIN.limit='250'
-uci set dhcp.ENTERTAIN.leasetime='24h'
-uci set dhcp.ENTERTAIN.netmask='255.255.255.0'
-uci set dhcp.ENTERTAIN.domain=$ENTERTAIN_domain
-uci set dhcp.ENTERTAIN.local='/'$ENTERTAIN_domain'/'
-uci set dhcp.ENTERTAIN.instance='Whitelist'
-#uci add_list dhcp.ENTERTAIN.dhcp_option='6,'$ENTERTAIN_ip 
-uci add_list dhcp.ENTERTAIN.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.ENTERTAIN.dhcp_option='3,'$ENTERTAIN_ip
-uci add_list dhcp.ENTERTAIN.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.ENTERTAIN.dhcp_option='15,'$ENTERTAIN_domain
-uci set dhcp.ENTERTAIN.server=$ENTERTAIN_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.GUEST=dhcp
-uci set dhcp.GUEST.interface='GUEST'
-uci set dhcp.GUEST.start='10'
-uci set dhcp.GUEST.limit='250'
-uci set dhcp.GUEST.leasetime='24h'
-uci set dhcp.GUEST.netmask='255.255.255.0'
-uci set dhcp.GUEST.domain=$GUEST_domain
-uci set dhcp.GUEST.local='/'$GUEST_domain'/'
-uci set dhcp.GUEST.instance='Whitelist'
-#uci add_list dhcp.GUEST.dhcp_option='6,'$GUEST_ip 
-uci add_list dhcp.GUEST.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.GUEST.dhcp_option='3,'$GUEST_ip
-uci add_list dhcp.GUEST.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.GUEST.dhcp_option='15,'$GUEST_domain
-uci set dhcp.GUEST.server=$GUEST_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.HCONTROL=dhcp
-uci set dhcp.HCONTROL.interface='HCONTROL'
-uci set dhcp.HCONTROL.start='10'
-uci set dhcp.HCONTROL.limit='250'
-uci set dhcp.HCONTROL.leasetime='24h'
-uci set dhcp.HCONTROL.netmask='255.255.255.0'
-uci set dhcp.HCONTROL.domain=$HCONTROL_domain
-uci set dhcp.HCONTROL.local='/'$HCONTROL_domain'/'
-uci set dhcp.HCONTROL.instance='Blacklist'
-#uci add_list dhcp.HCONTROL.dhcp_option='6,'$HCONTROL_ip 
-uci add_list dhcp.HCONTROL.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.HCONTROL.dhcp_option='3,'$HCONTROL_ip
-uci add_list dhcp.HCONTROL.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.HCONTROL.dhcp_option='15,'$HCONTROL_domain
-uci set dhcp.HCONTROL.server=$HCONTROL_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.INET=dhcp
-uci set dhcp.INET.interface='INET'
-uci set dhcp.INET.start='10'
-uci set dhcp.INET.limit='250'
-uci set dhcp.INET.leasetime='24h'
-uci set dhcp.INET.netmask='255.255.255.0'
-uci set dhcp.INET.domain=$INET_domain
-uci set dhcp.INET.local='/'$INET_domain'/'
-uci set dhcp.INET.instance='Blacklist'
-#uci add_list dhcp.INET.dhcp_option='6,'$INET_ip 
-uci add_list dhcp.INET.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.INET.dhcp_option='3,'$INET_ip
-uci add_list dhcp.INET.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.INET.dhcp_option='15,'$INET_domain
-uci set dhcp.INET.server=$INET_ip'#'$DNSMASQ_Relay_port
-
-uci del dhcp.lan.ra_slaac
-uci set dhcp.lan.start='10'
-uci set dhcp.lan.limit='250'
-uci set dhcp.lan.leasetime='24h'
-uci set dhcp.lan.netmask='255.255.255.0'
-uci set dhcp.lan.domain='lan.local'
-uci set dhcp.lan.local='/lan.local/'
-uci set dhcp.lan.instance='Blacklist'
-uci add_list dhcp.lan.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.lan.dhcp_option='3,'$LAN_ip
-uci add_list dhcp.lan.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.lan.dhcp_option='15,'$LAN_domain
-uci set dhcp.lan.server=$LAN_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.SERVER=dhcp
-uci set dhcp.SERVER.interface='SERVER'
-uci set dhcp.SERVER.start='10'
-uci set dhcp.SERVER.limit='250'
-uci set dhcp.SERVER.leasetime='24h'
-uci set dhcp.SERVER.netmask='255.255.255.0'
-uci set dhcp.SERVER.domain=$SERVER_domain
-uci set dhcp.SERVER.local='/'$SERVER_domain'/'
-uci set dhcp.SERVER.instance='Blacklist'
-#uci add_list dhcp.SERVER.dhcp_option='6,'$SERVER_ip 
-uci add_list dhcp.SERVER.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.SERVER.dhcp_option='3,'$SERVER_ip
-uci add_list dhcp.SERVER.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.SERVER.dhcp_option='15,'$SERVER_domain
-uci set dhcp.SERVER.server=$SERVER_ip'#'$DNSMASQ_Relay_port
-
-
-uci set dhcp.TELEKOM=dhcp
-uci set dhcp.TELEKOM.interface='TELEKOM'
-uci set dhcp.TELEKOM.start='10'
-uci set dhcp.TELEKOM.limit='250'
-uci set dhcp.TELEKOM.leasetime='24h'
-uci set dhcp.TELEKOM.netmask='255.255.255.0'
-uci set dhcp.TELEKOM.domain=$TELEKOM_domain
-uci set dhcp.TELEKOM.local='/'$TELEKOM_domain'/'
-uci set dhcp.TELEKOM.instance='Whitelist'
-#uci add_list dhcp.TELEKOM.dhcp_option='6,'$TELEKOM_ip 
-uci add_list dhcp.TELEKOM.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.TELEKOM.dhcp_option='3,'$TELEKOM_ip
-uci add_list dhcp.TELEKOM.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.TELEKOM.dhcp_option='15,'$TELEKOM_domain
-uci set dhcp.TELEKOM.server=$TELEKOM_ip'#'$DNSMASQ_Relay_port
-
-uci set dhcp.VOICE=dhcp
-uci set dhcp.VOICE.interface='VOICE'
-uci set dhcp.VOICE.start='10'
-uci set dhcp.VOICE.limit='250'
-uci set dhcp.VOICE.leasetime='24h'
-uci set dhcp.VOICE.netmask='255.255.255.0'
-uci set dhcp.VOICE.domain=$VOICE_domain
-uci set dhcp.VOICE.local='/'$VOICE_domain'/'
-uci set dhcp.VOICE.instance='Whitelist'
-#uci add_list dhcp.VOICE.dhcp_option='6,'$VOICE_ip 
-uci add_list dhcp.VOICE.dhcp_option='6,'$INET_GW 
-uci add_list dhcp.VOICE.dhcp_option='3,'$VOICE_ip
-uci add_list dhcp.VOICE.dhcp_option='42,'$INET_GW 
-uci add_list dhcp.VOICE.dhcp_option='15,'$VOICE_domain
-uci set dhcp.VOICE.server=$VOICE_ip'#'$DNSMASQ_Relay_port
-
+fi
 mkdir -p /etc/dnsmasq.d  >> install.log
 mkdir -p /etc/dnsmasq.d/Blacklist >> install.log
 mkdir -p /etc/dnsmasq.d/Whitelist >> install.log