Toolchain-Download mit ./make.sh gettoolchain

Beim Netstatus werden ab jetzt nur noch aktive Verbindungen angezeigt. Erhöht die Übersichtlichkeit...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@88 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/netstatus.cgi b/html/cgi-bin/netstatus.cgi
index 577e2ccd9be644937b797808a474d54117d4579b..8cad1fbf5c5802b6d9c1f412fc89df9a21b3f753 100644 (file)
--- a/html/cgi-bin/netstatus.cgi
+++ b/html/cgi-bin/netstatus.cgi
@@ -51,7 +51,7 @@ print "</td></tr></table>\n";
 
 print "<a name='interfaces'/>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
-$output = `/sbin/ifconfig -a`;
+$output = `/sbin/ifconfig`;
 $output = &Header::cleanhtml($output,"y");
 
 my @itfs = ('ORANGE','BLUE','GREEN');

diff --git a/make.sh b/make.sh
index 928220e41816d155e0d514f1d76b7d006ed92505..a543f1ecdfdf32fc62f74a8135f8ba4a2ff02361 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -1045,16 +1045,18 @@ toolchain)
 gettoolchain)
        BUILDMACHINE=`uname -m`
        # arbitrary name to be updated in case of new toolchain package upload
-       PACKAGE=$SNAME-1.4.11-toolchain-$BUILDMACHINE
-       URL_SFNET=`grep URL_SFNET lfs/Config | awk '{ print $3 }'`
+       PACKAGE=$SNAME-1.4-toolchain-$BUILDMACHINE
+       URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
        echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        cd $BASEDIR/cache
-       wget -c $URL_SFNET/ipcop/$PACKAGE.tar.gz $URL_SFNET/ipcop/$PACKAGE.md5
+       wget -c $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
        else
                if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
+                       echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
+                       cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi