summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/interfaces@5 (renamed from cfg-version/interfaces@4)0
-rwxr-xr-xscripts/rl-system.init4
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 82f6e613..86aec429 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,7 @@ curver_DATA += cfg-version/lldp@1
curver_DATA += cfg-version/pptp@1
curver_DATA += cfg-version/ntp@1
curver_DATA += cfg-version/webproxy@2
-curver_DATA += cfg-version/interfaces@4
+curver_DATA += cfg-version/interfaces@5
curver_DATA += cfg-version/dns-forwarding@2
curver_DATA += cfg-version/vyos-accel-ppp@2
curver_DATA += cfg-version/snmp@1
diff --git a/cfg-version/interfaces@4 b/cfg-version/interfaces@5
index e69de29b..e69de29b 100644
--- a/cfg-version/interfaces@4
+++ b/cfg-version/interfaces@5
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index c183aeeb..79ac1344 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -165,6 +165,10 @@ security_reset () {
pam-auth-update --package --remove radius
fi
+ # The PPPOE config files are re-generated by the configuration subsystem
+ # on every boot, so we delete the old ones here.
+ rm -f /etc/ppp/peers/pppoe*
+
# Disable root login over telnet
sed -i -e '/^# Pseudo-terminal (telnet)/,$d' /etc/securetty
}