/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12295-dhcpd-update-dnsservers.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12295-dhcpd-update-dnsservers.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Thu Dec 29 10:20:49 2022 UTC (23 months ago) by brianr
Branch: MAIN
CVS Tags: e-smith-base-5_8_1-25_el7_sme, e-smith-base-5_8_1-29_el7_sme, e-smith-base-5_8_1-31_el7_sme, e-smith-base-5_8_1-28_el7_sme, e-smith-base-5_8_1-24_el7_sme, e-smith-base-5_8_1-27_el7_sme, e-smith-base-5_8_1-30_el7_sme, e-smith-base-5_8_1-26_el7_sme, HEAD 
* Thu Dec 29 2022 Brianb Read <brianr@bjsystems.co.uk> 5.8.1-24.sme
-  DHCPD set DNSServers [SME: 12295]
1 brianr 1.1 diff -urN e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/dhcpd.conf/25DomainNameServers e-smith-base-5.8.1/root/etc/e-smith/templates/etc/dhcpd.conf/25DomainNameServers
2     --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/dhcpd.conf/25DomainNameServers 2021-06-06 21:30:37.000000000 +0100
3     +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/dhcpd.conf/25DomainNameServers 2022-12-29 10:02:33.027225656 +0000
4     @@ -2,9 +2,9 @@
5     my @dnsserv;
6     my $dnscustom = $DB->get_prop('dhcpd', 'dnscustom') || 'disabled';
7     if ( $dnscustom eq 'enabled') {
8     - push @dnsserv,$DB->get_prop('dhcpd', 'dns1server') if $DB->get_prop('dhcpd', 'dns1server');
9     - push @dnsserv,$DB->get_prop('dhcpd', 'dns2server') if $DB->get_prop('dhcpd', 'dns2server');
10     - push @dnsserv,$DB->get_prop('dhcpd', 'dns3server') if $DB->get_prop('dhcpd', 'dns3server');
11     + push @dnsserv,$DB->get_prop('dhcpd', 'dns1server') if $DB->get_prop('dhcpd', 'dns1server') && $DB->get_prop('dhcpd', 'dns1server') ne "";
12     + push @dnsserv,$DB->get_prop('dhcpd', 'dns2server') if $DB->get_prop('dhcpd', 'dns2server') && $DB->get_prop('dhcpd', 'dns2server') ne "";
13     + push @dnsserv,$DB->get_prop('dhcpd', 'dns3server') if $DB->get_prop('dhcpd', 'dns3server') && $DB->get_prop('dhcpd', 'dns3server') ne "";
14     }
15     # force our own dhcp server unless there is already 2 or more
16     push @dnsserv,$LocalIP unless ( scalar(@dnsserv) >=2) ;
17     @@ -14,3 +14,4 @@
18    
19     $OUT = " option domain-name-servers ". join(",", @dnsserv) .";";
20     }
21     +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed