Treiber fuer 1-Wire-Geraete hinzugefuegt --> Digitemp fuer "Karl S."

Schreibt DNS-Server wenn red = static ist.

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

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 9ce3dce85154a9967940b8001b673b382df85b40..d1f9177c1e14ce3534e6fa0f4553146819f3bf5f 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
-# Tue May 22 15:36:59 2007
+# Tue May 22 16:36:31 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -964,7 +964,7 @@ CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
 # CONFIG_SCSI_NCR53C8XX_PROFILE is not set
-CONFIG_SCSI_MCA_53C9X=m
+# CONFIG_SCSI_MCA_53C9X is not set
 CONFIG_SCSI_PAS16=m
 CONFIG_SCSI_PSI240I=m
 # CONFIG_SCSI_QLOGIC_FAS is not set
@@ -1510,7 +1510,14 @@ CONFIG_HPET_MMAP=y
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
+CONFIG_W1=m
+CONFIG_W1_MATROX=m
+CONFIG_W1_DS9490=m
+CONFIG_W1_DS9490_BRIDGE=m
+CONFIG_W1_THERM=m
+CONFIG_W1_SMEM=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
 
 #
 # Hardware Monitoring support

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index 75133d71f97d70241f8469279fc2d4a525bcd09c..0c09fc1cc23289d9a8dfeba8c922967b92df4e93 100644 (file)
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
-# Tue May 22 15:37:18 2007
+# Tue May 22 16:36:21 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1513,7 +1513,14 @@ CONFIG_HPET_MMAP=y
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
+CONFIG_W1=m
+CONFIG_W1_MATROX=m
+CONFIG_W1_DS9490=m
+CONFIG_W1_DS9490_BRIDGE=m
+CONFIG_W1_THERM=m
+CONFIG_W1_SMEM=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
 
 #
 # Hardware Monitoring support
@@ -1917,6 +1924,17 @@ CONFIG_USB_XUSBATM=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
 
 #
 # MMC/SD Card support

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 9ab2e220c3445f6e7165f6c73104ab7a59702b05..7e533e4e2d5e049f11798a56c963a232cb4b743c 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -336,8 +336,6 @@ WARNING: untranslated string: pakfire configuration
 WARNING: untranslated string: red
 WARNING: untranslated string: selecttraffic
 WARNING: untranslated string: settingsc
-WARNING: untranslated string: show areas
-WARNING: untranslated string: show lines
 WARNING: untranslated string: sstraffic
 WARNING: untranslated string: trafficblue
 WARNING: untranslated string: trafficdate

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 7dc36ac6c727a1b8f4a1e94e00b555a0cc8c849e..8e717ec033e020447025100e6fff0fcd1abb355c 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -266,6 +266,8 @@ WARNING: translation string unused: sectors read from disk per second
 WARNING: translation string unused: sectors written to disk per second
 WARNING: translation string unused: shaping add options
 WARNING: translation string unused: shared memory
+WARNING: translation string unused: show areas
+WARNING: translation string unused: show lines
 WARNING: translation string unused: sitekeyfile
 WARNING: translation string unused: smbreload
 WARNING: translation string unused: squid extension methods

diff --git a/src/initscripts/init.d/connectioncheck b/src/initscripts/init.d/connectioncheck
index 893f249e0d4b39138d8686402f7432cf5985aef5..4fa1eeaf42e1d85e69ad6813091b5b9b8b265b44 100644 (file)
--- a/src/initscripts/init.d/connectioncheck
+++ b/src/initscripts/init.d/connectioncheck
@@ -37,9 +37,7 @@ case "$1" in
                RCREDSTART=`/bin/ps ax | /bin/grep 'red start'`
                if [ "$TIMETOSTART" -eq 1 ]; then
                        msg "fail before pppd start : no sync, trying again"
-                       /etc/rc.d/init.d/red stop
-                       /etc/rc.d/init.d/red clear
-                       /etc/rc.d/init.d/red start
+                       /etc/rc.d/init.d/network restart red
                        exit
                fi
                # give 5 s more at pppd to be visible  with ps ax after 'red start' end
@@ -84,7 +82,7 @@ case "$1" in
 
        #Don't erase keepconnected because it is used to watch user actions
        /usr/bin/touch /var/ipfire/red/redial
-       /etc/rc.d/init.d/red stop
+       /etc/rc.d/init.d/network stop red
        while ( /bin/ps ax | /bin/grep -q [p]ppd ); do
                msg "waiting pppd exit"
                /bin/sleep 2
@@ -99,7 +97,7 @@ case "$1" in
        if [ "$ATTEMPTS" -ge "$MAXRETRIES" ]; then
                echo "0" > /var/ipfire/red/keepconnected
                msg "Clearing RED interface"
-               /etc/rc.d/init.d/red clear
+               /etc/rc.d/init.d/network stop red
                if [ "$BACKUPPROFILE" != '' ]; then
                        /bin/rm -f /var/ipfire/ppp/settings
                        /bin/cp "/var/ipfire/ppp/settings-$BACKUPPROFILE" /var/ipfire/ppp/settings
@@ -107,14 +105,14 @@ case "$1" in
        else
                echo $ATTEMPTS > /var/ipfire/red/keepconnected
        fi
-       /etc/rc.d/init.d/red start
+       /etc/rc.d/init.d/network start red
        ;;
   reconnect)
        while ( /bin/ps ax | /bin/grep -q [p]ppd ); do
                /bin/sleep 2
        done
        msg "will connect again"
-       /etc/rc.d/init.d/red start
+       /etc/rc.d/init.d/network start red
        ;;
   *)
        /bin/echo "Usage: $0 {start|reconnect}"

diff --git a/src/initscripts/init.d/net/common/ipv4-static b/src/initscripts/init.d/net/common/ipv4-static
index f45955585cb0dc72985dbc78c46e0b4d1adf39c7..2c8aec13865e6254f6bfc7c498e3f2126be98e70 100644 (file)
--- a/src/initscripts/init.d/net/common/ipv4-static
+++ b/src/initscripts/init.d/net/common/ipv4-static
@@ -45,9 +45,15 @@ case "${2}" in
                                echo_warning
                        else
                                boot_mesg "Setting up default gateway..."
+                               echo $DEFAULT_GATEWAY > /var/ipfire/red/remote-ipaddress
                                ip route add default via ${GATEWAY} dev ${1}
                                evaluate_retval
-                        fi
+                               boot_mesg "Registering DNS server..."
+                               echo $DNS1 > /var/ipfire/red/dns1
+                               echo $DNS2 > /var/ipfire/red/dns2
+                               echo $ADDRESS > /var/ipfire/red/local-ipaddress
+                               evaluate_retval
+                       fi
                fi
        ;;