T671: cleanup rl-system and move components to better suited locations

- CHanging sysctl values should be done by out generic file /etc/sysctl.d/30-vyatta-router.conf - NTP config must not be restored from from /opt as it is entirely rendered from scratch.
vyos · Jan 17, 2021 · b74daed · b74daed
1 parent 0dccb30
commit b74daed
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 39 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -62,7 +62,6 @@ sysconf_DATA += sysconf/issue
 sysconf_DATA += sysconf/issue.net
 sysconf_DATA += sysconf/motd.tail
 sysconf_DATA += sysconf/rsyslog.conf
-sysconf_DATA += sysconf/ntp.conf
 sysconf_DATA += sysconf/default_ssh
 sysconf_DATA += sysconf/securetty
 sysconf_DATA += sysconf/vyatta-sysctl.conf

diff --git a/scripts/rl-system.init b/scripts/rl-system.init
@@ -128,9 +128,6 @@ set_ipv6_params ()
 	return
     fi
 
-    # Enable forwarding
-    echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-
     # Increase route table limit
     echo 262144 >/proc/sys/net/ipv6/route/max_size
 
@@ -144,16 +141,6 @@ set_ipv6_params ()
     done
 }
 
-setup_ntp_config_file () {
-    template_ntp_conf=/opt/vyatta/etc/ntp.conf
-    if [ -e $template_ntp_conf ]; then
-	cp -f $template_ntp_conf /etc/ntp.conf
-    else
-	log_failure_msg "NTP template config file doesn\'t exist"
-    fi
-}
-
-
 # These are all the default security setting which are later
 # overridden when configuration is read. These are the values the
 # system defaults.
@@ -186,7 +173,6 @@ start () {
 	log_failure_msg "can't initialize ssh host keys"
     clear_or_override_config_files || \
 	log_failure_msg "can\'t reset config files"
-    setup_ntp_config_file
 
     add_new_serial_if || \
 	log_failure_msg "can\'t add serial interfaces"

diff --git a/sysconf/ntp.conf b/sysconf/ntp.conf
diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf
@@ -71,6 +71,9 @@ net.ipv4.conf.all.send_redirects=1
 # Increase size of buffer for netlink
 net.core.rmem_max=2097152
 
+# Enable packet forwarding for IPv6
+net.ipv6.conf.all.forwarding=1
+
 # Do not forget IPv6 addresses when a link goes down
 net.ipv6.conf.default.keep_addr_on_down=1
 net.ipv6.conf.all.keep_addr_on_down=1