Meta-Dateien werden nicht verschluesselt.

Statische IPs fuer die rote Schnittstelle funzen nun.

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

diff --git a/src/initscripts/init.d/net/ifdown b/src/initscripts/init.d/net/ifdown
index 64604ba2719a52b0ae0d7e4f60388261d60ad3a5..6b31c74d42941947c0b59195b6c862f0a0ac4220 100644 (file)
--- a/src/initscripts/init.d/net/ifdown
+++ b/src/initscripts/init.d/net/ifdown
@@ -57,8 +57,8 @@ then
                elif [ "${RED_TYPE}" == "STATIC" ]; then
                        NAME=${name} ADDRESS=${RED_ADDRESS} NETMASK=${RED_NETMASK}\
                        NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \
                elif [ "${RED_TYPE}" == "STATIC" ]; then
                        NAME=${name} ADDRESS=${RED_ADDRESS} NETMASK=${RED_NETMASK}\
                        NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \

-                       DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY}
-                       /etc/rc.d/init.d/net/red/ipv4-static ${RED_DEV} down
+                       DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY} \
+                       /etc/rc.d/init.d/net/common/ipv4-static ${RED_DEV} down

                fi
                
                ### Cleanup the system when red goes down ###
                fi
                
                ### Cleanup the system when red goes down ###

diff --git a/src/initscripts/init.d/net/ifup b/src/initscripts/init.d/net/ifup
index e9ff1d67bc3f82c9e4f002569c7794146fa5c538..252fd0f121151de6df363d0d1013ea43c1950e54 100644 (file)
--- a/src/initscripts/init.d/net/ifup
+++ b/src/initscripts/init.d/net/ifup
@@ -78,7 +78,7 @@ boot_mesg_flush
                elif [ "${RED_TYPE}" == "STATIC" ]; then
                        NAME=${name} ADDRESS=${RED_ADDRESS} NETMASK=${RED_NETMASK} \
                        NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \
                elif [ "${RED_TYPE}" == "STATIC" ]; then
                        NAME=${name} ADDRESS=${RED_ADDRESS} NETMASK=${RED_NETMASK} \
                        NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \

-                       DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY}
+                       DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY} \

                        /etc/rc.d/init.d/net/common/ipv4-static ${RED_DEV} up
                fi
                
                        /etc/rc.d/init.d/net/common/ipv4-static ${RED_DEV} up
                fi
                

diff --git a/tools/make-functions b/tools/make-functions
index cc66f335dd71c85f71420c7b0862014124a923b1..d1b534dd0e852e7f31580df891afc9e39bba8f37 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -715,7 +715,7 @@ sign_packages() {
        if gpg --list-key 64D96617 ; then
                if [ -d "$BASEDIR/packages" ]; then
                        cd $BASEDIR/packages
        if gpg --list-key 64D96617 ; then
                if [ -d "$BASEDIR/packages" ]; then
                        cd $BASEDIR/packages

-               for i in `ls $BASEDIR/packages`; do
+               for i in `ls $BASEDIR/packages/*.ipfire`; do

                        echo -n "Signing $i"
                                echo $GPG_PASSPHRASE | gpg --sign --armor -u 64D96617 --passphrase-fd 0 $i
                                if [ "$?" -eq "0" ]; then
                        echo -n "Signing $i"
                                echo $GPG_PASSPHRASE | gpg --sign --armor -u 64D96617 --passphrase-fd 0 $i
                                if [ "$?" -eq "0" ]; then