Merge branch 'islavista' into jenner

11 files changed, 10 insertions, 10 deletions

diff --git a/templates/clear/arp6/address/node.def b/templates/clear/arp6/address/node.def
deleted file mode 100644
index dc27e11..0000000
--- a/templates/clear/arp6/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear ARP cache for an IPv6 address
diff --git a/templates/clear/arp6/address/node.tag/node.def b/templates/clear/arp6/address/node.tag/node.def
deleted file mode 100644
index fe94cdd..0000000
--- a/templates/clear/arp6/address/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Clear ARP cache for an IPv6 address
-allowed: echo -n '<h:h:h:h:h:h:h:h>'
-run: sudo /sbin/ip -f inet6 neigh flush to "$4"
diff --git a/templates/clear/arp6/interface/node.def b/templates/clear/arp6/interface/node.def
deleted file mode 100644
index 306b999..0000000
--- a/templates/clear/arp6/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 ARP cache for interface
diff --git a/templates/clear/arp6/node.def b/templates/clear/arp6/node.def
deleted file mode 100644
index e4d5ff3..0000000
--- a/templates/clear/arp6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 Address Resolution Protocol (ARP) cache
diff --git a/templates/clear/ipv6/neighbors/address/node.def b/templates/clear/ipv6/neighbors/address/node.def
new file mode 100644
index 0000000..ffb7376
--- /dev/null
+++ b/templates/clear/ipv6/neighbors/address/node.def
@@ -0,0 +1 @@
+help: Clear ND cache for an IPv6 address
diff --git a/templates/clear/ipv6/neighbors/address/node.tag/node.def b/templates/clear/ipv6/neighbors/address/node.tag/node.def
new file mode 100644
index 0000000..4aaec8a
--- /dev/null
+++ b/templates/clear/ipv6/neighbors/address/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Clear ND cache for an IPv6 address
+allowed: echo -n '<h:h:h:h:h:h:h:h>'
+run: sudo /sbin/ip -f inet6 neigh flush to "$5"
diff --git a/templates/clear/ipv6/neighbors/interface/node.def b/templates/clear/ipv6/neighbors/interface/node.def
new file mode 100644
index 0000000..db4adaf
--- /dev/null
+++ b/templates/clear/ipv6/neighbors/interface/node.def
@@ -0,0 +1 @@
+help: Clear IPv6 ND cache for interface
diff --git a/templates/clear/arp6/interface/node.tag/node.def b/templates/clear/ipv6/neighbors/interface/node.tag/node.def
index 2766b17..9bc879a 100644
--- a/templates/clear/arp6/interface/node.tag/node.def
+++ b/templates/clear/ipv6/neighbors/interface/node.tag/node.def
@@ -1,5 +1,5 @@
-help: Clear IPv6 ARP cache for interface
+help: Clear IPv6 ND cache for interface
 allowed: local -a array ;
 	 array=( /sys/class/net/{eth,vmnet}* ) ;
 	 echo  -n ${array[@]##*/}
-run: sudo /sbin/ip -f inet6 neigh flush dev "$4"
+run: sudo /sbin/ip -f inet6 neigh flush dev "$5"
diff --git a/templates/clear/ipv6/neighbors/node.def b/templates/clear/ipv6/neighbors/node.def
new file mode 100644
index 0000000..cde35f9
--- /dev/null
+++ b/templates/clear/ipv6/neighbors/node.def
@@ -0,0 +1 @@
+help: Clear IPv6 Neighbor Discovery (ND) cache
diff --git a/templates/show/arp6/node.def b/templates/show/arp6/node.def
deleted file mode 100644
index c45f295..0000000
--- a/templates/show/arp6/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 Address Resolution Protocol (ARP) information
-run: /bin/ip -f inet6 neigh list
diff --git a/templates/show/ipv6/neighbors/node.def b/templates/show/ipv6/neighbors/node.def
new file mode 100644
index 0000000..184e8c1
--- /dev/null
+++ b/templates/show/ipv6/neighbors/node.def
@@ -0,0 +1,2 @@
+help: Show IPv6 Neighbor Discovery (ND) information
+run: /bin/ip -f inet6 neigh list