T671: we no longer support telnet, remove config

1 files changed, 5 insertions, 9 deletions

diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 043b1ede..cc78700b 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -99,7 +99,7 @@ clear_or_override_config_files ()
 
 update_interface_config () {
     if [ -d /run/udev/vyatta ]; then
-	$vyatta_sbindir/vyatta_interface_rescan /run/udev/vyatta $BOOTFILE
+        $vyatta_sbindir/vyatta_interface_rescan /run/udev/vyatta $BOOTFILE
     fi
 }
 
@@ -109,11 +109,11 @@ create_ssh_host_keys () {
         ssh-keygen -q -N '' -t rsa -f /etc/ssh/ssh_host_rsa_key
     fi;
     if [ ! -f "/etc/ssh/ssh_host_dsa_key" ]; then
-	syslog "Creating ssh v2 dsa host key."
+        syslog "Creating ssh v2 dsa host key."
         ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key
     fi;
     if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
-	syslog "Creating ssh ed25519 host key."
+        syslog "Creating ssh ed25519 host key."
         ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
     fi;
 }
@@ -124,17 +124,13 @@ create_ssh_host_keys () {
 security_reset () {
    # restore PAM back to virgin state (no radius other services)
    rm -f /etc/pam_radius_auth.conf
-   if grep -q radius /etc/pam.d/common-auth
-   then
-	pam-auth-update --package --remove radius
+   if grep -q radius /etc/pam.d/common-auth; then
+      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
 }
 
 start () {