[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bedfda83c9e5dc09c1e2168c6cf35bb810d4f0aa - IPFire-SCM

1 Dec 2019

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  bedfda83c9e5dc09c1e2168c6cf35bb810d4f0aa (commit)
       via  941520c69cf5bf50c3c737f47b27ccb28a73a746 (commit)
       via  d346d474677b9507fce16ee2d2774435658d6ba1 (commit)
      from  455291f90e0729ad8a8edc743d4375f782728ad3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bedfda83c9e5dc09c1e2168c6cf35bb810d4f0aa
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Dec 1 18:33:19 2019 +0100
dhcpcd.exe: remove red.down run on "NOCARRIER"
after "NOCARRIER" the dhcp client always run "EXPIRE" event.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 941520c69cf5bf50c3c737f47b27ccb28a73a746
Merge: d346d4746 455291f90
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Dec 1 16:36:43 2019 +0100
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit d346d474677b9507fce16ee2d2774435658d6ba1
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Dec 1 15:29:59 2019 +0100
up/down beep: move from ppp ip-up/down to general red.up/down
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/aarch64/initscripts  | 2 ++
 config/rootfiles/common/armv5tel/initscripts | 2 ++
 config/rootfiles/common/i586/initscripts     | 2 ++
 config/rootfiles/common/x86_64/initscripts   | 2 ++
 config/rootfiles/core/139/filelists/files    | 4 ++++
 config/rootfiles/core/139/update.sh          | 3 +++
 html/cgi-bin/gui.cgi                         | 4 ++--
 src/initscripts/networking/dhcpcd.exe        | 6 +++---
 src/initscripts/networking/red.down/99-beep  | 2 ++
 src/initscripts/networking/red.up/99-beep    | 2 ++
 src/ppp/ip-down                              | 2 --
 src/ppp/ip-up                                | 2 --
 12 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/initscripts/networking/red.down/99-beep
 create mode 100644 src/initscripts/networking/red.up/99-beep
Difference in files:

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 8a025c3bf..202da7372 100644
--- 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 8a025c3bf..202da7372 100644
--- 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 4349cd618..9d4f7e5f3 100644
--- 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 4349cd618..9d4f7e5f3 100644
--- 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 a08d12e20..7a05c13fe 100644
--- a/config/rootfiles/core/139/filelists/files
+++ b/config/rootfiles/core/139/filelists/files
@@ -8,9 +8,13 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/networking/dhcpcd.exe
 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 fb3105aa0..d0b979d6b 100644
--- 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 726abf7de..f06b0f923 100644
--- 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/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index 5b1c5ab16..28d62a14e 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -5,7 +5,7 @@
 #
 # Authors     : Arne Fitzenreiter - arne_f@ipfire.org
 #
-# Version     : 02.00
+# Version     : 02.10
 #
 # Notes       : 
 #
@@ -80,7 +80,7 @@ dhcpcd_down()
    if [ "$RED_TYPE" == "DHCP" ]; then
    	rm -f /var/ipfire/red/active
    	if [ ! $reason == "PREINIT" ]; then
-			logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
+			logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
    		run_subdir ${rc_base}/init.d/networking/red.down/
    	fi
    fi
@@ -88,5 +88,5 @@ dhcpcd_down()
case "$reason" in
 BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	dhcpcd_up;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)	dhcpcd_down;;
+PREINIT|EXPIRE|FAIL|IPV4LL|NAK|RELEASE|STOP)		dhcpcd_down;;
 esac
diff --git a/src/initscripts/networking/red.down/99-beep b/src/initscripts/networking/red.down/99-beep
new file mode 100644
index 000000000..d615cb4a1
--- /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
index 000000000..6e4b08c59
--- /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 c7bbdbf4e..ea0dcbf94 100644
--- 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 b059a297d..c7357708a 100644
--- 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
-
hooks/post-receive
--
IPFire 2.x development tree

    