From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH] Avoid calling a perl script for getting DNS-Servers from DHCP Date: Wed, 26 Sep 2018 18:22:42 +0100 Message-ID: <1537982562-18609-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3437986839095655641==" List-Id: --===============3437986839095655641== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This codes does the same as before but we do everythin in Bash now. Signed-off-by: Jonatan Schlag --- config/rootfiles/common/aarch64/initscripts | 1 - config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/x86_64/initscripts | 1 - src/initscripts/helper/getdnsfromdhcpc.pl | 47 --------------------------= -- src/initscripts/networking/dhcpcd.exe | 16 ++++++++-- 6 files changed, 14 insertions(+), 53 deletions(-) delete mode 100644 src/initscripts/helper/getdnsfromdhcpc.pl diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/c= ommon/aarch64/initscripts index bce6d0f..081e6d4 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/aws-setup -etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/= common/armv5tel/initscripts index bce6d0f..081e6d4 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/aws-setup -etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/comm= on/i586/initscripts index f793952..134d9ca 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/aws-setup -etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/co= mmon/x86_64/initscripts index f793952..134d9ca 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/aws-setup -etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache diff --git a/src/initscripts/helper/getdnsfromdhcpc.pl b/src/initscripts/help= er/getdnsfromdhcpc.pl deleted file mode 100644 index e4d461d..0000000 --- a/src/initscripts/helper/getdnsfromdhcpc.pl +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl -############################################################################= ### -# = # -# IPFire.org - A linux based firewall = # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # -# = # -# This program is free software: you can redistribute it and/or modify = # -# it under the terms of the GNU General Public License as published by = # -# the Free Software Foundation, either version 3 of the License, or = # -# (at your option) any later version. = # -# = # -# This program is distributed in the hope that it will be useful, = # -# but WITHOUT ANY WARRANTY; without even the implied warranty of = # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # -# GNU General Public License for more details. = # -# = # -# You should have received a copy of the GNU General Public License = # -# along with this program. If not, see . = # -# = # -############################################################################= ### - -use strict; -require '/var/ipfire/general-functions.pl'; - -my $count =3D $ARGV[0]; -my ($dhcp, $dns, @alldns, %dhcpc); - -if ($count eq "" || $count < 1) { - die "Bad DNS number given"; } - -if (open(FILE, "${General::swroot}/red/iface")) { - my $iface =3D ; - close FILE; - chomp ($iface); - if (!&General::readhash("${General::swroot}/dhcpc/dhcpcd-$iface.info", \%dh= cpc)) { - die "Could not open dhcpc info file"; - } -} else { - die "Could not open interface file"; -} - - -$dns =3D $dhcpc{'domain_name_servers'}; - -(a)alldns =3D split(' ', $dns); - -print "$alldns[$count - 1]\n"; diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networki= ng/dhcpcd.exe index a2cdc66..227481e 100644 --- a/src/initscripts/networking/dhcpcd.exe +++ b/src/initscripts/networking/dhcpcd.exe @@ -49,8 +49,20 @@ dhcpcd_up() echo -n ${DNS0} > /var/ipfire/red/dns1 echo -n ${DNS1} > /var/ipfire/red/dns2 else - echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1 - echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2 + # Check that we get DNS-Servers from our DHCP Server + if [ -n "${new_domain_name_servers}" ]; then + # Convert the string into an arry + dhcp_dns_servers=3D(${new_domain_name_servers}) + # We need 2 DNS-Servers + if [ ${#dhcp_dns_servers[@]} -lt 2 ]; then + logger -p local0.error -t dhcpcd.exe[$$] "DHCP Server does provides les= s then two DNS-Servers"=09 + else + echo -n "${dhcp_dns_servers[0]}" > /var/ipfire/red/dns1 + echo -n "${dhcp_dns_servers[1]}" > /var/ipfire/red/dns2 + fi + else + logger -p local0.error -t dhcpcd.exe[$$] "DHCP Servers does not provide = any DNS-Servers." + fi fi =20 #Get IP Address --=20 1.8.3.1 --===============3437986839095655641==--