up/down beep: move from ppp ip-up/down to general red.up/down

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 8a025c3bfcd4702158bf01b0e9070ac68000b361..202da737200110e9694147e2677713c1e8e9043d 100644 (file)
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/10-static-routes
 etc/rc.d/init.d/networking/red.down/20-firewall
+etc/rc.d/init.d/networking/red.down/99-beep
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
+etc/rc.d/init.d/networking/red.up/99-beep
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 8a025c3bfcd4702158bf01b0e9070ac68000b361..202da737200110e9694147e2677713c1e8e9043d 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/10-static-routes
 etc/rc.d/init.d/networking/red.down/20-firewall
+etc/rc.d/init.d/networking/red.down/99-beep
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
+etc/rc.d/init.d/networking/red.up/99-beep
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 4349cd61877510839ad4d9f40b641df61d354d84..9d4f7e5f39a3fb77528828bde5de278de433a03f 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/10-static-routes
 etc/rc.d/init.d/networking/red.down/20-firewall
+etc/rc.d/init.d/networking/red.down/99-beep
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
+etc/rc.d/init.d/networking/red.up/99-beep
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update

diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 4349cd61877510839ad4d9f40b641df61d354d84..9d4f7e5f39a3fb77528828bde5de278de433a03f 100644 (file)
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/10-static-routes
 etc/rc.d/init.d/networking/red.down/20-firewall
+etc/rc.d/init.d/networking/red.down/99-beep
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
+etc/rc.d/init.d/networking/red.up/99-beep
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update

diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files
index 3ab3eece1f0f54269793af0691c99789436d63d2..8557affaa53c72392731eb1d77177fccbcb91449 100644 (file)
--- a/config/rootfiles/core/139/filelists/files
+++ b/config/rootfiles/core/139/filelists/files
@@ -7,9 +7,13 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/rc.d/init.d/functions
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/functions.network
+etc/rc.d/init.d/networking/red.down/99-beep
 etc/rc.d/init.d/networking/red.up/23-suricata
+etc/rc.d/init.d/networking/red.up/99-beep
 etc/rc.d/init.d/unbound
 etc/suricata/suricata.yaml
+etc/ppp/ip-down
+etc/ppp/ip-up
 srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/mail.cgi

diff --git a/config/rootfiles/core/139/update.sh b/config/rootfiles/core/139/update.sh
index fb3105aa03f9e744aa8d89345936bd7afdfa4e0c..d0b979d6bcb27b655749ad8f14a2ecf62e156d53 100644 (file)
--- a/config/rootfiles/core/139/update.sh
+++ b/config/rootfiles/core/139/update.sh
@@ -49,6 +49,9 @@ done
 # Extract files
 extract_files
 
+# move nobeeps if exist
+[ -e "/var/ipfire/ppp/nobeeps" ] mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps
+
 # update linker config
 ldconfig
 

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 726abf7dee5742d7b0b80ecf74f7ecf05f61b11e..f06b0f9238bba29b17ecda2b1b10ded8199d5696 100644 (file)
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -78,9 +78,9 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
         # Beep on ip-up or ip-down. Default is ON.
         if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') {
             $cgiparams{'PPPUPDOWNBEEP'} = 'off';
-            system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
+            system ('/usr/bin/touch', "${General::swroot}/red/nobeeps");
         } else {
-            unlink "${General::swroot}/ppp/nobeeps";
+            unlink "${General::swroot}/red/nobeeps";
         }
 
         # write cgi vars to the file.

diff --git a/src/initscripts/networking/red.down/99-beep b/src/initscripts/networking/red.down/99-beep
new file mode 100644 (file)
index 0000000..d615cb4
--- /dev/null
+++ b/src/initscripts/networking/red.down/99-beep
@@ -0,0 +1,2 @@
+#!/bin/bash
+[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep down

diff --git a/src/initscripts/networking/red.up/99-beep b/src/initscripts/networking/red.up/99-beep
new file mode 100644 (file)
index 0000000..6e4b08c
--- /dev/null
+++ b/src/initscripts/networking/red.up/99-beep
@@ -0,0 +1,2 @@
+#!/bin/bash
+[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep up

diff --git a/src/ppp/ip-down b/src/ppp/ip-down
index c7bbdbf4e5a70d327259b4674deeb21463dd0da8..ea0dcbf94e2433e0ca78822c033fbe2841c912a9 100644 (file)
--- a/src/ppp/ip-down
+++ b/src/ppp/ip-down
@@ -28,7 +28,5 @@ rm -f /var/ipfire/red/active
 
 run_subdir ${rc_base}/init.d/networking/red.down/
 
-[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep down
-
 [ -e "/var/ipfire/red/keepconnected" ] && \
                /etc/rc.d/init.d/connectd reconnect &

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index b059a297d1cf2855e06e5fa8bf585be8196f29e5..c7357708a63e2e048301419df5f3786797214f24 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -79,5 +79,3 @@ else
 fi
 mv /tmp/hosts /etc/hosts
 
-[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up
-