From: Arne Fitzenreiter Date: Thu, 8 Jul 2010 21:55:21 +0000 (+0200) Subject: Fix dns dhcp client helper script. X-Git-Tag: v2.9-beta1~171^2~8^2~3 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d25238aadf23d9c21ac3c2ad192af2925114b6bb Fix dns dhcp client helper script. --- diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index 8341b40b45..f1526f038d 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -1,3 +1,4 @@ etc/system-release -etc/init.d/networking/red +etc/rc.d/init.d/networking/red +etc/rc.d/helper/getdnsfromdhcpc.pl srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ee4aa7305b..1f0f4d3f1f 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -184,7 +184,6 @@ * libogg-1.1.4 * liboping-1.3.4 * libpcap-1.0.0 -* libpng-1.2.12 * libpng-1.2.44 * libpri-1.4.10.2 * libsafe_2.0-16 @@ -225,6 +224,7 @@ * mediatomb-svn2020 * memtest86+-4.10 * miau-0.6.5 +* minicom-2.4 * misc-progs * mkinitcpio-0.5.9 * mktemp-1.5 @@ -277,7 +277,7 @@ * popt-1.10.4 * portmap_6.0 * postfix-2.6.5 -* ppp-2.4.4 +* ppp-2.4.5 * pptp-1.7.2 * procps-3.2.6 * psmisc-22.2 @@ -292,7 +292,6 @@ * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 -* rp-pppoe-3.8 * rrdtool-1.2.30 * rssdler-0.4.0a * rsync-3.0.7 @@ -333,7 +332,6 @@ * teamspeak-2.0.24.1 * texinfo-4.8 * tftp-hpa-0.48 -* tiff-3.8.2 * tiff-3.9.4 * traceroute-2.0.12 * tripwire-2.4.1.2 diff --git a/src/initscripts/helper/getdnsfromdhcpc.pl b/src/initscripts/helper/getdnsfromdhcpc.pl index 980d87a842..e4d461d573 100644 --- a/src/initscripts/helper/getdnsfromdhcpc.pl +++ b/src/initscripts/helper/getdnsfromdhcpc.pl @@ -42,6 +42,6 @@ if (open(FILE, "${General::swroot}/red/iface")) { $dns = $dhcpc{'domain_name_servers'}; -@alldns = split(',', $dns); +@alldns = split(' ', $dns); print "$alldns[$count - 1]\n";