diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index b0efa0add..85bd76226 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -3,6 +3,7 @@ - Juergen Sawinski: fixed network.init and back-ticks - updated neon (0.24.4) + - improved ifup.sh and added the code to install it *) 2003-11-20 (2.0.0-rc2 - 2.0.0-rc3) diff --git a/package/base/sysfiles/ifup.sh b/package/base/sysfiles/ifup.sh index 3be9a087d..7036507f2 100644 --- a/package/base/sysfiles/ifup.sh +++ b/package/base/sysfiles/ifup.sh @@ -7,12 +7,14 @@ useage() { [ "$1" ] || useage -if [ "$2" = "" ] ; then - profile="`cat /etc/network/profile`" +if [ "$2" = "" ] ; then + profile="`cat /etc/network/profile 2> /dev/null`" else profile="$2" fi -/etc/network/rocknet "$1" "$2" "${x#if}" -echo "$profile" > /etc/network/proflie +profile=${profile:-default} + +/etc/network/rocknet "$profile" "$1" "${0#/sbin/if}" +echo "$profile" > /etc/network/profile diff --git a/package/base/sysfiles/sysfiles.conf b/package/base/sysfiles/sysfiles.conf index 2a56452d2..622648358 100644 --- a/package/base/sysfiles/sysfiles.conf +++ b/package/base/sysfiles/sysfiles.conf @@ -71,8 +71,11 @@ EOT for x in $( cd $confdir ; echo rocknet_*.sh ) ; do dst="${x#rocknet_}" ; z="/" dst="${dst//_/$z}" - cp -v $confdir/$x etc/network/$dst + cp -vf $confdir/$x etc/network/$dst done + cp -vf $confdir/ifup.sh sbin/ifup ; chmod +x sbin/ifup + ln -sf ifup sbin/ifdown + echo "Create /etc/issue, /etc/issue.ansi and /etc/issue.net ... " rocktxt="ROCK Linux $rockver $arch"