webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

network startup: Always cleanup before red gets started

Browse Source 
There is no sense in doing this only in /etc/init.d/network
and not in /etc/init.d/networking/red

This files should be always deleted before a startup

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Jonatan Schlag
2023-08-29 10:52:41 +02:00
committed by Michael Tremer
parent f2e90a6e0e
commit 6361fa73c6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/initscripts/networking/red
View File

@@ -80,6 +80,9 @@ fi
case "${1}" in
start)
# Remove possible leftover files
rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
boot_mesg "Bringing up the ${DEVICE} interface..."
boot_mesg_flush

6
src/initscripts/system/network
View File

@@ -62,11 +62,7 @@ case "${DO}" in
/etc/rc.d/init.d/networking/orange start
# RED
if [ "$red" == "1" ]; then
# Remove possible leftover files
rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
/etc/rc.d/init.d/networking/red start
fi
[ "$red" == "1" ] && /etc/rc.d/init.d/networking/red start
# Create IPsec interfaces
/usr/local/bin/ipsec-interfaces