Dialctrl.pl integriert.

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

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index c480585286249c6e1b11fdbff3b886efeafc7f64..90de0cd2c1da4dca8e1fb2f0e31bc57d4bab3355 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -41,6 +41,7 @@ etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/20-RL-firewall
+etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.up/10-multicast
@@ -53,6 +54,7 @@ etc/rc.d/init.d/networking/red.up/26-xtaccess
 etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
+etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
 #etc/rc.d/init.d/portmap

diff --git a/doc/language_issues.de b/doc/language_issues.de
index ccfd6154d6530494bcef8df67173366c01e0faf7..e24d133645302f9e79b6078aa2d99678ee53163e 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -8,6 +8,7 @@ WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Verbose
+WARNING: translation string unused: add new alias
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
@@ -35,6 +36,7 @@ WARNING: translation string unused: advproxy ssadvanced proxy
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
+WARNING: translation string unused: aliases not active
 WARNING: translation string unused: all interfaces
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: alt information
@@ -80,6 +82,7 @@ WARNING: translation string unused: could not open installed updates file
 WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create new backup
+WARNING: translation string unused: current aliases
 WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
@@ -106,6 +109,7 @@ WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
 WARNING: translation string unused: eciadsl help
 WARNING: translation string unused: eciadsl upload
+WARNING: translation string unused: edit an existing alias
 WARNING: translation string unused: editor
 WARNING: translation string unused: email server can not be empty
 WARNING: translation string unused: enable javascript
@@ -128,6 +132,7 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: external aliases configuration
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firmware
@@ -169,6 +174,9 @@ WARNING: translation string unused: invalid uplink speed
 WARNING: translation string unused: invalid upstream proxy username or password setting
 WARNING: translation string unused: invalid vpi vpci
 WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ip alias added
+WARNING: translation string unused: ip alias changed
+WARNING: translation string unused: ip alias removed
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: irq cpu usage

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3ff03b3ac95df72d9ec99b893b20a4b504be1c39..c960292b04269a5ac518510531c24110089bc001 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -8,6 +8,7 @@ WARNING: translation string unused: Remote IP
 WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Verbose
+WARNING: translation string unused: add new alias
 WARNING: translation string unused: add new ovpn
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
@@ -36,6 +37,7 @@ WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
+WARNING: translation string unused: aliases not active
 WARNING: translation string unused: all interfaces
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: alt information
@@ -101,6 +103,7 @@ WARNING: translation string unused: could not open installed updates file
 WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create new backup
+WARNING: translation string unused: current aliases
 WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
@@ -130,6 +133,7 @@ WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
 WARNING: translation string unused: eciadsl help
 WARNING: translation string unused: eciadsl upload
+WARNING: translation string unused: edit an existing alias
 WARNING: translation string unused: editor
 WARNING: translation string unused: email server can not be empty
 WARNING: translation string unused: enable javascript
@@ -152,6 +156,7 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: external aliases configuration
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firmware
@@ -196,6 +201,9 @@ WARNING: translation string unused: invalid uplink speed
 WARNING: translation string unused: invalid upstream proxy username or password setting
 WARNING: translation string unused: invalid vpi vpci
 WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ip alias added
+WARNING: translation string unused: ip alias changed
+WARNING: translation string unused: ip alias removed
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: irq cpu usage

diff --git a/lfs/initscripts b/lfs/initscripts
index 53d839ea0dec246928f96f99248b8a1496fb5a64..724862b698494b42eb99ca22df418de27d86216b 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -145,9 +145,13 @@ $(TARGET) :
                /etc/rc.d/init.d/networking/red.up/25-portfw
        ln -sf ../../../../../usr/local/bin/setxtaccess \
                /etc/rc.d/init.d/networking/red.up/26-xtaccess
+       ln -sf ../../../../../usr/local/bin/dialctrl.pl \
+               /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
        
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
+       ln -sf ../../../../../usr/local/bin/dialctrl.pl \
+               /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 
        for i in green blue orange; do \
                ln -sf any /etc/rc.d/init.d/networking/$$i; \

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index 365dbe02ae3cac9666c7cd9c821aca3bb5cdd4c4..3d82493cf6e0f2d5e8a2b2c8be7cd335403412a0 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -689,6 +689,8 @@ run_subdir() {
                        K) ${i} stop ;;
                        RS) ${i} restart ;;
                        RL) ${i} reload ;;
+                       U) ${i} up ;;
+                       D) ${i] down ;;
                        *) ${i} ;;
                esac
        done