diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-02-23 15:35:04 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-02-23 15:35:07 +0100 |
| commit | f9c23ae4b62eba56465c998043bd54294992d676 (patch) | |
| tree | 983de7d1ed3a3f2e74eeea7629b457b74a7c0a67 | |
| parent | 99a148ef779eafa025d9121344dbc91f28b8ce28 (diff) | |
| download | vyatta-cfg-system-f9c23ae4b62eba56465c998043bd54294992d676.tar.gz vyatta-cfg-system-f9c23ae4b62eba56465c998043bd54294992d676.zip | |
pppoe: T1318: Migrate pppoe interfaces to vyos-1x
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/interfaces@5 (renamed from cfg-version/interfaces@4) | 0 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 4 |
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 } |