Merge branch 'current' into lithiumlithium

Conflicts:
	debian/changelog
	scripts/snmp/vyatta-snmp-v3.pl
	scripts/snmp/vyatta-snmp.pl
	templates/interfaces/tunnel/node.def
	templates/system/sysctl/custom/node.def

1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 6a2b8d25..62eac9e7 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -98,8 +98,8 @@ clear_or_override_config_files ()
 }
 
 update_interface_config () {
-    if [ -d /dev/.udev/vyatta ]; then
-	$vyatta_sbindir/vyatta_interface_rescan /dev/.udev/vyatta $BOOTFILE
+    if [ -d /run/udev/vyatta ]; then
+	$vyatta_sbindir/vyatta_interface_rescan /run/udev/vyatta $BOOTFILE
     fi
 }
 
@@ -116,6 +116,10 @@ create_ssh_host_keys () {
 	syslog "Creating ssh v1 host key."
         ssh-keygen -q -N '' -t rsa1 -f /etc/ssh/ssh_host_key
     fi;
+    if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
+	syslog "Creating ssh ed25519 host key."
+        ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
+    fi;
 }
 
 set_ipv6_params ()