From 4f4362736de7a8d75ad31c158e7964e65cc4b1bd Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 13 Jan 2021 21:40:36 +0100
Subject: ssh: T3212: do not make /run/sshd directory disappear on failure

(cherry picked from commit 57fca79636b783dc4be2df1bc1ff12a0ce79d988)
---
 interface-definitions/ntp.xml.in  | 2 +-
 interface-definitions/snmp.xml.in | 2 +-
 interface-definitions/ssh.xml.in  | 2 +-
 interface-definitions/vrf.xml.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index b939d9dc6..d244b56bb 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -5,8 +5,8 @@
     <children>
       <node name="ntp" owner="${vyos_conf_scripts_dir}/ntp.py">
         <properties>
-          <priority>400</priority>
           <help>Network Time Protocol (NTP) configuration</help>
+          <priority>900</priority>
         </properties>
         <children>
           <tagNode name="server">
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 0a0a29f4d..3a993ec9c 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -6,7 +6,7 @@
       <node name="snmp" owner="${vyos_conf_scripts_dir}/snmp.py">
         <properties>
           <help>Simple Network Management Protocol (SNMP)</help>
-          <priority>980</priority>
+          <priority>900</priority>
         </properties>
         <children>
           <tagNode name="community">
diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index d94e29427..a2ce3c1c9 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -6,7 +6,7 @@
       <node name="ssh" owner="${vyos_conf_scripts_dir}/ssh.py">
         <properties>
           <help>Secure Shell (SSH)</help>
-          <priority>500</priority>
+          <priority>1000</priority>
         </properties>
         <children>
           <node name="access-control">
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 159f4ea3e..06923971d 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -4,7 +4,7 @@
     <properties>
       <help>Virtual Routing and Forwarding</help>
       <!-- must be before any interface creation -->
-      <priority>60</priority>
+      <priority>10</priority>
     </properties>
     <children>
       <leafNode name="bind-to-all">
-- 
cgit v1.2.3