Merge branch 'current' into lithiumlithium

Conflicts:
	Makefile.am
	debian/changelog
	templates/restart/dns/forwarding/node.def
	templates/show/version/added/node.def
	templates/show/version/all/node.def
	templates/show/version/deleted/node.def
	templates/show/version/downgraded/node.def
	templates/show/version/node.def
	templates/show/version/upgraded/node.def

130 files changed, 138 insertions, 317 deletions

diff --git a/templates/add/raid/node.tag/member/node.tag/node.def b/templates/add/raid/node.tag/member/node.tag/node.def
index b526e1e..14ac911 100644
--- a/templates/add/raid/node.tag/member/node.tag/node.def
+++ b/templates/add/raid/node.tag/member/node.tag/node.def
@@ -40,7 +40,7 @@ run:
 	    mounted_on_root=0
 	    mounted_on=`mount | grep "^/dev/${raid_set}" | awk '{ print $3 }'`
 	    for dir in $mounted_on ; do
-		if [ "$dir" = "/" -o "$dir" = "/live/image" ]; then
+		if [ "$dir" = "/" -o "$dir" = "/lib/live/mount/persistence" ]; then
 		    mounted_on_root=1
 		fi
 	    done
diff --git a/templates/clone/system/config/node.tag/from/node.tag/node.def b/templates/clone/system/config/node.tag/from/node.tag/node.def
index c244559..d883c8c 100644
--- a/templates/clone/system/config/node.tag/from/node.tag/node.def
+++ b/templates/clone/system/config/node.tag/from/node.tag/node.def
@@ -1,11 +1,11 @@
 help: Image to update from
-allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     reply+=( "running" )
-    if [[ -d /live/image/config ]];then
+    if [[ -d /lib/live/mount/persistence/config ]];then
       reply+=( "disk-install" )
     fi
     echo "${reply[*]}"
diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def
index 6e6e340..ec82322 100644
--- a/templates/clone/system/config/node.tag/node.def
+++ b/templates/clone/system/config/node.tag/node.def
@@ -1,8 +1,8 @@
 help: Image to update
-allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     echo "${reply[*]}"
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
diff --git a/templates/disconnect/interface/node.tag/node.def b/templates/disconnect/interface/node.tag/node.def
index a3b3cf3..4a937b9 100644
--- a/templates/disconnect/interface/node.tag/node.def
+++ b/templates/disconnect/interface/node.tag/node.def
@@ -29,6 +29,6 @@ run:
 
                 echo "Bringing interface $IFNAME down..."
 		echo "`date`: User $USER stopping PPP daemon for $IFNAME by disconnect command" >> $LOGFILE
-                sudo /sbin/poff $IFNAME
+                sudo /usr/bin/poff $IFNAME
 	fi
 
diff --git a/templates/generate/ssh-server-key/node.def b/templates/generate/ssh-server-key/node.def
new file mode 100644
index 0000000..a31a734
--- /dev/null
+++ b/templates/generate/ssh-server-key/node.def
@@ -0,0 +1,2 @@
+help: Regenerate the host SSH keys and restart the SSH server
+run: ${vyatta_bindir}/ssh-server-key
diff --git a/templates/install/system/node.def b/templates/install/system/node.def
deleted file mode 100644
index c200404..0000000
--- a/templates/install/system/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Install system to hard drive
-run: sudo /opt/vyatta/sbin/install-system
diff --git a/templates/monitor/firewall/name/node.tag/node.def b/templates/monitor/firewall/name/node.tag/node.def
index 16b9244..9593cb8 100644
--- a/templates/monitor/firewall/name/node.tag/node.def
+++ b/templates/monitor/firewall/name/node.tag/node.def
@@ -3,4 +3,4 @@ allowed: local -a ARR
          eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name))"
          echo ${ARR[@]}
 run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-[0-9]*-[A,D,R]\]"
+     ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-([0-9]*|default)-[A,D,R]\]"
diff --git a/templates/monitor/interfaces/bonding/node.def b/templates/monitor/interfaces/bonding/node.def
deleted file mode 100644
index b7e8bce..0000000
--- a/templates/monitor/interfaces/bonding/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a bonding interface
-run: bmon -p bond*,!bond*v*,!bond*.*
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.def
deleted file mode 100644
index 4241bc8..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a vif
-run: bmon -p $4.*
diff --git a/templates/monitor/interfaces/bridge/node.def b/templates/monitor/interfaces/bridge/node.def
deleted file mode 100644
index 5b2a395..0000000
--- a/templates/monitor/interfaces/bridge/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a bridge interface
-run: bmon -p br*
diff --git a/templates/monitor/interfaces/ethernet/node.def b/templates/monitor/interfaces/ethernet/node.def
deleted file mode 100644
index 60c4970..0000000
--- a/templates/monitor/interfaces/ethernet/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a ethernet interface
-run: bmon -p eth*,!eth*v*,!eth*.*
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.def
deleted file mode 100644
index 4241bc8..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a vif
-run: bmon -p $4.*
diff --git a/templates/monitor/interfaces/loopback/node.def b/templates/monitor/interfaces/loopback/node.def
deleted file mode 100644
index 9d3a8a5..0000000
--- a/templates/monitor/interfaces/loopback/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a loopback interface
-run: bmon -p lo
diff --git a/templates/monitor/interfaces/node.def b/templates/monitor/interfaces/node.def
deleted file mode 100644
index ef09ad0..0000000
--- a/templates/monitor/interfaces/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor interfaces
-run: bmon -p  !gre0,!sit0,!tunl0,!ip6tnl0;
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.def
deleted file mode 100644
index 8cd18c9..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a pseudo-ethernet interface
-run: bmon -p peth*
diff --git a/templates/monitor/interfaces/tunnel/node.def b/templates/monitor/interfaces/tunnel/node.def
deleted file mode 100644
index a41faa2..0000000
--- a/templates/monitor/interfaces/tunnel/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a tunnel interface
-run: bmon -p tun*
diff --git a/templates/monitor/interfaces/vrrp/node.def b/templates/monitor/interfaces/vrrp/node.def
deleted file mode 100644
index 64c6684..0000000
--- a/templates/monitor/interfaces/vrrp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a vrrp interface
-run: bmon -p eth*v*,bond*v*
diff --git a/templates/monitor/interfaces/vti/node.def b/templates/monitor/interfaces/vti/node.def
deleted file mode 100644
index b7429bd..0000000
--- a/templates/monitor/interfaces/vti/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a vti interface
-run: bmon -p vti*
diff --git a/templates/poweroff/at/node.def b/templates/poweroff/at/node.def
deleted file mode 100644
index 537bfff..0000000
--- a/templates/poweroff/at/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Poweroff at a specific time
diff --git a/templates/poweroff/at/node.tag/node.def b/templates/poweroff/at/node.tag/node.def
deleted file mode 100644
index 932e04b..0000000
--- a/templates/poweroff/at/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Poweroff the system at a future time
-allowed: echo -n '<HH:MM>' '<MMDDYY>' '<midnight>' '<noon>'
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_at --at_time "$3"
diff --git a/templates/poweroff/cancel/node.def b/templates/poweroff/cancel/node.def
deleted file mode 100644
index c45f17a..0000000
--- a/templates/poweroff/cancel/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Cancel a pending poweroff
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_cancel
diff --git a/templates/poweroff/node.def b/templates/poweroff/node.def
deleted file mode 100644
index ccb7338..0000000
--- a/templates/poweroff/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Poweroff the system
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff
diff --git a/templates/poweroff/now/node.def b/templates/poweroff/now/node.def
deleted file mode 100644
index 6b67572..0000000
--- a/templates/poweroff/now/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Poweroff the system without confirmation
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff --now
diff --git a/templates/reboot/at/node.def b/templates/reboot/at/node.def
deleted file mode 100644
index 9944ff7..0000000
--- a/templates/reboot/at/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Reboot at a specific time
diff --git a/templates/reboot/at/node.tag/node.def b/templates/reboot/at/node.tag/node.def
deleted file mode 100644
index 62f39f9..0000000
--- a/templates/reboot/at/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Reboot the system at a future time
-allowed: echo -n '<HH:MM>' '<MMDDYY>' '<midnight>' '<noon>'
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_at --at_time "$3"
diff --git a/templates/reboot/cancel/node.def b/templates/reboot/cancel/node.def
deleted file mode 100644
index 110f595..0000000
--- a/templates/reboot/cancel/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Cancel a pending reboot
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_cancel
diff --git a/templates/reboot/node.def b/templates/reboot/node.def
deleted file mode 100644
index e65917d..0000000
--- a/templates/reboot/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Reboot the system
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot
diff --git a/templates/reboot/now/node.def b/templates/reboot/now/node.def
deleted file mode 100644
index 2171b45..0000000
--- a/templates/reboot/now/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Reboot the system without confirmation
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot --now
diff --git a/templates/release/dhcpv6/interface/node.tag/node.def b/templates/release/dhcpv6/interface/node.tag/node.def
index 05f45c8..a8faa6c 100644
--- a/templates/release/dhcpv6/interface/node.tag/node.def
+++ b/templates/release/dhcpv6/interface/node.tag/node.def
@@ -2,8 +2,8 @@ help: Release DHCPv6 lease for interface
 
 allowed:
     local -a array
-    array=( /var/lib/dhcp3/dhclient_v6_*.conf )
-    tail=${array[@]#/var/lib/dhcp3/dhclient_v6_}
+    array=( /var/lib/dhcp/dhclient_v6_*.conf )
+    tail=${array[@]#/var/lib/dhcp/dhclient_v6_}
     ifnames=${tail[@]%.conf}
     echo -n ${ifnames[@]}
 
diff --git a/templates/renew/dhcpv6/interface/node.tag/node.def b/templates/renew/dhcpv6/interface/node.tag/node.def
index 2ef676d..9b5c191 100644
--- a/templates/renew/dhcpv6/interface/node.tag/node.def
+++ b/templates/renew/dhcpv6/interface/node.tag/node.def
@@ -2,8 +2,8 @@ help: Renew a DHCPv6 lease on an interface
 
 allowed:
     local -a array
-    array=( /var/lib/dhcp3/dhclient_v6_*.conf )
-    tail=${array[@]#/var/lib/dhcp3/dhclient_v6_}
+    array=( /var/lib/dhcp/dhclient_v6_*.conf )
+    tail=${array[@]#/var/lib/dhcp/dhclient_v6_}
     ifnames=${tail[@]%.conf}
     echo -n ${ifnames[@]}
 
diff --git a/templates/reset/dns/forwarding/all/node.def b/templates/reset/dns/forwarding/all/node.def
deleted file mode 100644
index b90aafb..0000000
--- a/templates/reset/dns/forwarding/all/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Reset DNS forwarding cache and counters
-run:
-        if ps ax | grep dnsmasq | grep -v grep > /dev/null
-        then
-            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-all
-        else
-            echo "DNS forwarding not configured"
-        fi
diff --git a/templates/reset/dns/forwarding/cache/node.def b/templates/reset/dns/forwarding/cache/node.def
deleted file mode 100644
index 9e1a610..0000000
--- a/templates/reset/dns/forwarding/cache/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Reset DNS forwarding cache
-run:
-        if ps ax | grep dnsmasq | grep -v grep > /dev/null
-        then
-            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-cache
-        else
-            echo "DNS forwarding not configured"
-        fi
diff --git a/templates/reset/dns/forwarding/node.def b/templates/reset/dns/forwarding/node.def
deleted file mode 100644
index a1bcb10..0000000
--- a/templates/reset/dns/forwarding/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Reset DNS forwarding variables
diff --git a/templates/reset/dns/node.def b/templates/reset/dns/node.def
deleted file mode 100644
index 5f8ef26..0000000
--- a/templates/reset/dns/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Reset Domain Name Server (DNS) variables
diff --git a/templates/restart/dns/forwarding/node.def b/templates/restart/dns/forwarding/node.def
deleted file mode 100644
index 5740ebf..0000000
--- a/templates/restart/dns/forwarding/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-help: Restart DNS forwarding
-
-run:
-      if cli-shell-api existsActive service dns forwarding; then
-          echo "Restarting DNS forwarding..."
-          sudo /opt/vyatta/sbin/vyatta-dns-forwarding.pl --restart-dnsforwarding;
-          if [[ $? -eq 0 ]]; then
-              echo "Success!"
-          fi
-      else
-          echo "DNS forwarding is not configured"
-      fi
diff --git a/templates/restart/dns/node.def b/templates/restart/dns/node.def
deleted file mode 100644
index 3118853..0000000
--- a/templates/restart/dns/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Restart DNS services
diff --git a/templates/show/arp/node.def b/templates/show/arp/node.def
deleted file mode 100644
index 013e016..0000000
--- a/templates/show/arp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show Address Resolution Protocol (ARP) information
-run: /usr/sbin/arp -e -n
diff --git a/templates/show/arp/node.tag/node.def b/templates/show/arp/node.tag/node.def
deleted file mode 100644
index 648797b..0000000
--- a/templates/show/arp/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show Address Resolution Protocol (ARP) cache for specified interface
-allowed: local -a vals;
-         vals=($(${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet));
-         vals+=($(${vyatta_sbindir}/vyatta-interfaces.pl --show bridge));
-         vals+=($(${vyatta_sbindir}/vyatta-interfaces.pl --show bonding));
-         echo ${vals[@]};
-run: /usr/sbin/arp -e -n -i "$3"
diff --git a/templates/show/bridge/node.def b/templates/show/bridge/node.def
deleted file mode 100644
index a1ed782..0000000
--- a/templates/show/bridge/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show bridging information
-run:  /usr/sbin/brctl show
diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def
deleted file mode 100644
index d07958c..0000000
--- a/templates/show/bridge/node.tag/macs/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show bridge Media Access Control (MAC) address table
-run: /usr/sbin/brctl showmacs "$3"
diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def
deleted file mode 100644
index d20611f..0000000
--- a/templates/show/bridge/node.tag/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Show bridge information for a given bridge interface
-allowed: local -a array ;
-	 array=( /sys/class/net/br* ) ;
-	 echo  -n '<brN>' ${array[@]##*/}
-run: /usr/sbin/brctl show "$3"
diff --git a/templates/show/bridge/node.tag/spanning-tree/node.def b/templates/show/bridge/node.tag/spanning-tree/node.def
deleted file mode 100644
index 3921867..0000000
--- a/templates/show/bridge/node.tag/spanning-tree/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show bridge spanning tree information
-run: /usr/sbin/brctl showstp "$3"
diff --git a/templates/show/configuration/all/node.def b/templates/show/configuration/all/node.def
deleted file mode 100644
index 3f93f48..0000000
--- a/templates/show/configuration/all/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Show running configuration (including default values)
-run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
-     then
-        cli-shell-api showCfg --show-show-defaults --show-active-only \
-          --show-hide-secrets
-     else
-        echo Must be an admin user to run this command.
-     fi
diff --git a/templates/show/configuration/commands/node.def b/templates/show/configuration/commands/node.def
deleted file mode 100644
index a2d55cf..0000000
--- a/templates/show/configuration/commands/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show running configuration as set commands
-run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
-     then
-        ${vyatta_sbindir}/vyatta-config-gen-sets.pl
-     else
-        echo Must be an admin user to run this command.
-     fi
diff --git a/templates/show/configuration/files/node.def b/templates/show/configuration/files/node.def
deleted file mode 100644
index 698ba14..0000000
--- a/templates/show/configuration/files/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Show available saved configurations
-run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
-     then
-       find ${vyatta_sysconfdir}/config/ -type f -not -name ".*" -not -name "config.boot.*" -printf "%f\t(%Tc)\t%T@\n" | sort -r -k3 | awk -F"\t" '{printf ("%-20s\t%s\n", $1,$2) ;}'
-     else
-        echo Must be an admin user to run this command.
-     fi
-
-
-
-
diff --git a/templates/show/configuration/node.def b/templates/show/configuration/node.def
deleted file mode 100644
index 34813a4..0000000
--- a/templates/show/configuration/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show running configuration
-run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
-     then
-        cli-shell-api showCfg --show-active-only --show-hide-secrets
-     else
-        echo Must be an admin user to run this command.
-     fi
diff --git a/templates/show/date/node.def b/templates/show/date/node.def
deleted file mode 100644
index eb5adf9..0000000
--- a/templates/show/date/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show system date and time
-run: /bin/date
diff --git a/templates/show/date/utc/maya/node.def b/templates/show/date/utc/maya/node.def
deleted file mode 100644
index ddc82c7..0000000
--- a/templates/show/date/utc/maya/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show UTC date in Maya calendar format
-run: ${vyatta_bindir}/maya-date.py $(date +%s)
diff --git a/templates/show/date/utc/node.def b/templates/show/date/utc/node.def
deleted file mode 100644
index cb12d00..0000000
--- a/templates/show/date/utc/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show system date and time as Coordinated Universal Time
-run: /bin/date -u
diff --git a/templates/show/disk/node.def b/templates/show/disk/node.def
deleted file mode 100644
index 8572a9f..0000000
--- a/templates/show/disk/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help:  Show status of disk device
diff --git a/templates/show/disk/node.tag/format/node.def b/templates/show/disk/node.tag/format/node.def
deleted file mode 100644
index ad87cfc..0000000
--- a/templates/show/disk/node.tag/format/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show disk drive formatting
-run: disk_dev="/dev/$3"
-     if [ ! -b "$disk_dev" ]
-     then echo "$3 is not a disk device"
-          exit 1
-     fi
-     sudo /sbin/fdisk -l "$disk_dev"
diff --git a/templates/show/disk/node.tag/node.def b/templates/show/disk/node.tag/node.def
deleted file mode 100644
index 8690008..0000000
--- a/templates/show/disk/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help:  Disk device name
-allowed: awk 'NR > 2 && $4 !~ /[0-9]$/ { print $4 }' </proc/partitions
-
-
diff --git a/templates/show/dns/forwarding/nameservers/node.def b/templates/show/dns/forwarding/nameservers/node.def
deleted file mode 100644
index 0609f6a..0000000
--- a/templates/show/dns/forwarding/nameservers/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show DNS forwarding nameservers information
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --show-nameservers
diff --git a/templates/show/dns/forwarding/node.def b/templates/show/dns/forwarding/node.def
deleted file mode 100644
index eb9ce4b..0000000
--- a/templates/show/dns/forwarding/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show DNS forwarding information
diff --git a/templates/show/dns/forwarding/statistics/node.def b/templates/show/dns/forwarding/statistics/node.def
deleted file mode 100644
index a73b49d..0000000
--- a/templates/show/dns/forwarding/statistics/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Show DNS forwarding statistics
-run:
-        if ps ax | grep dnsmasq | grep -v grep > /dev/null
-        then
-            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --show-statistics
-        else
-            echo "DNS forwarding not configured"
-        fi
diff --git a/templates/show/hardware/cpu/detail/node.def b/templates/show/hardware/cpu/detail/node.def
deleted file mode 100644
index 2e3c616..0000000
--- a/templates/show/hardware/cpu/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show system CPU details
-run: less $_vyatta_less_options \
-	--prompt=".cpu info" \
-	-- /proc/cpuinfo
diff --git a/templates/show/hardware/cpu/node.def b/templates/show/hardware/cpu/node.def
deleted file mode 100644
index 653b558..0000000
--- a/templates/show/hardware/cpu/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show CPU info
-run:  lscpu
diff --git a/templates/show/hardware/cpu/summary/node.def b/templates/show/hardware/cpu/summary/node.def
deleted file mode 100644
index 6a6582a..0000000
--- a/templates/show/hardware/cpu/summary/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show CPU's on system
-run:  ${vyatta_bindir}/vyatta-cpu-summary.pl
diff --git a/templates/show/hardware/dmi/node.def b/templates/show/hardware/dmi/node.def
deleted file mode 100644
index 897c9ec..0000000
--- a/templates/show/hardware/dmi/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show system DMI details
-run: ${vyatta_bindir}/vyatta-show-dmi
diff --git a/templates/show/hardware/mem/node.def b/templates/show/hardware/mem/node.def
deleted file mode 100644
index acf1109..0000000
--- a/templates/show/hardware/mem/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show system RAM details
-run: less $_vyatta_less_options \
-	--prompt=".mem info" \
-	-- /proc/meminfo
diff --git a/templates/show/hardware/node.def b/templates/show/hardware/node.def
deleted file mode 100644
index e9a8e4d..0000000
--- a/templates/show/hardware/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show system hardware details
diff --git a/templates/show/hardware/pci/detailed/node.def b/templates/show/hardware/pci/detailed/node.def
deleted file mode 100644
index b76b487..0000000
--- a/templates/show/hardware/pci/detailed/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show verbose system PCI bus details
-run: lspci -vvv
diff --git a/templates/show/hardware/pci/node.def b/templates/show/hardware/pci/node.def
deleted file mode 100644
index 9b2e890..0000000
--- a/templates/show/hardware/pci/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show system PCI bus details
-run: lspci
diff --git a/templates/show/hardware/scsi/detail/node.def b/templates/show/hardware/scsi/detail/node.def
deleted file mode 100644
index 902b570..0000000
--- a/templates/show/hardware/scsi/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show detailed SCSI device information
-run: lsscsi -vvv
diff --git a/templates/show/hardware/scsi/node.def b/templates/show/hardware/scsi/node.def
deleted file mode 100644
index 54d406a..0000000
--- a/templates/show/hardware/scsi/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SCSI device information
-run: lsscsi
diff --git a/templates/show/hardware/usb/detail/node.def b/templates/show/hardware/usb/detail/node.def
deleted file mode 100644
index a976d7c..0000000
--- a/templates/show/hardware/usb/detail/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show detailed USB bus information
-run: lsusb -v
-
diff --git a/templates/show/hardware/usb/node.def b/templates/show/hardware/usb/node.def
deleted file mode 100644
index d66f163..0000000
--- a/templates/show/hardware/usb/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show peripherals connected to the USB bus
-run: lsusb
diff --git a/templates/show/log/image/node.tag/all/node.def b/templates/show/log/image/node.tag/all/node.def
index eb3c87c..fd15df0 100644
--- a/templates/show/log/image/node.tag/all/node.def
+++ b/templates/show/log/image/node.tag/all/node.def
@@ -2,4 +2,4 @@ help: Show contents of all master log files for image
 run: eval $(lesspipe)
      less $_vyatta_less_options \
 	--prompt=".log?m, file %i of %m., page %dt of %D" \
-	-- `printf "%s\n" /live/image/boot/$4/live-rw/var/log/messages* | sort -nr`
+	-- `printf "%s\n" /lib/live/mount/persistence/boot/$4/rw/var/log/messages* | sort -nr`
diff --git a/templates/show/log/image/node.tag/authorization/node.def b/templates/show/log/image/node.tag/authorization/node.def
index aec45cc..e7e3330 100644
--- a/templates/show/log/image/node.tag/authorization/node.def
+++ b/templates/show/log/image/node.tag/authorization/node.def
@@ -1,4 +1,4 @@
 help: Show listing of authorization attempts for image
 run: less $_vyatta_less_options \
 	--prompt=".log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/auth.log
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/auth.log
diff --git a/templates/show/log/image/node.tag/directory/node.def b/templates/show/log/image/node.tag/directory/node.def
index d9cb9cb..6d813cf 100644
--- a/templates/show/log/image/node.tag/directory/node.def
+++ b/templates/show/log/image/node.tag/directory/node.def
@@ -1,4 +1,4 @@
 help: Show listing of user-defined log files for image
-run: if [ -d /live/image/boot/$4/live-rw/var/log/user ]
-     then ls /live/image/boot/$4/live-rw/var/log/user
+run: if [ -d /lib/live/mount/persistence/boot/$4/rw/var/log/user ]
+     then ls /lib/live/mount/persistence/boot/$4/rw/var/log/user
      fi
diff --git a/templates/show/log/image/node.tag/file/node.tag/node.def b/templates/show/log/image/node.tag/file/node.tag/node.def
index f347a86..5f6bb18 100644
--- a/templates/show/log/image/node.tag/file/node.tag/node.def
+++ b/templates/show/log/image/node.tag/file/node.tag/node.def
@@ -1,7 +1,7 @@
 help: Show contents of specified user-defined log file for image
 allowed: local -a array ;
-         array=( /live/image/boot/${COMP_WORDS[3]}/live-rw/var/log/user/* ) ;
+         array=( /lib/live/mount/persistence/boot/${COMP_WORDS[3]}/rw/var/log/user/* ) ;
          [ ${#array[@]} -gt 0 ] && echo  -n ${array[@]##*/} || echo -n none
 run: less $_vyatta_less_options \
 	--prompt=".$4 log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/user/$6
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/user/$6
diff --git a/templates/show/log/image/node.tag/node.def b/templates/show/log/image/node.tag/node.def
index daeb44e..05e7d01 100644
--- a/templates/show/log/image/node.tag/node.def
+++ b/templates/show/log/image/node.tag/node.def
@@ -1,11 +1,11 @@
 help: Show contents of master log file for image
-allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -f /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     echo "${reply[*]}"
 
 run: less $_vyatta_less_options \
 	--prompt=".log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/messages
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/messages
diff --git a/templates/show/log/image/node.tag/tail/node.def b/templates/show/log/image/node.tag/tail/node.def
index c7f0190..090eae4 100644
--- a/templates/show/log/image/node.tag/tail/node.def
+++ b/templates/show/log/image/node.tag/tail/node.def
@@ -1,2 +1,2 @@
 help: Show last lines of messages file
-run: tail /live/image/boot/$4/live-rw/var/log/messages
+run: tail /lib/live/mount/persistence/boot/$4/rw/var/log/messages
diff --git a/templates/show/log/image/node.tag/tail/node.tag/node.def b/templates/show/log/image/node.tag/tail/node.tag/node.def
index f0af559..2c3eb14 100644
--- a/templates/show/log/image/node.tag/tail/node.tag/node.def
+++ b/templates/show/log/image/node.tag/tail/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Show last changes to messages
 allowed: echo -n '<NUMBER>'
-run: tail -n "$6"  /live/image/boot/$4/live-rw/var/log/messages | ${VYATTA_PAGER:-cat}
+run: tail -n "$6"  /lib/live/mount/persistence/boot/$4/rw/var/log/messages | ${VYATTA_PAGER:-cat}
diff --git a/templates/show/raid/node.def b/templates/show/raid/node.def
deleted file mode 100644
index d0ec96d..0000000
--- a/templates/show/raid/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help:  Show status of RAID set
-
diff --git a/templates/show/raid/node.tag/node.def b/templates/show/raid/node.tag/node.def
deleted file mode 100644
index ff64da4..0000000
--- a/templates/show/raid/node.tag/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-help:  RAID set name
-
-allowed:
-	local -a raid_sets ; 
-	raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'`
-	echo -n $raid_sets
-
-run:
-	raid_set_name=$3
-	raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'`
-	valid_set=`echo $raid_sets | grep $raid_set_name`
-	if [ -z $valid_set ]; then
-	    echo "$raid_set_name is not a RAID set"
-	else
-	    if [ -r /dev/${raid_set_name} ]; then
-		# This should work without sudo because we have read
-		# access to the dev, but for some reason mdadm must be
-		# run as root in order to succeed.
-		sudo /sbin/mdadm --detail /dev/${raid_set_name}
-	    else
-		echo "Must be administrator or root to display RAID status"
-	    fi
-	fi
diff --git a/templates/show/remote-config/node.def b/templates/show/remote-config/node.def
new file mode 100644
index 0000000..1675abd
--- /dev/null
+++ b/templates/show/remote-config/node.def
@@ -0,0 +1 @@
+help: Show remote side config
diff --git a/templates/show/remote-config/openvpn/node.def b/templates/show/remote-config/openvpn/node.def
new file mode 100644
index 0000000..d417cb6
--- /dev/null
+++ b/templates/show/remote-config/openvpn/node.def
@@ -0,0 +1 @@
+help: Show remote side config for OpenVPN
diff --git a/templates/show/remote-config/openvpn/node.tag/node.def b/templates/show/remote-config/openvpn/node.tag/node.def
new file mode 100644
index 0000000..afb8cfb
--- /dev/null
+++ b/templates/show/remote-config/openvpn/node.tag/node.def
@@ -0,0 +1,5 @@
+help: Show remote side OpenVPN config
+
+allowed: local -a array ;
+         eval "array=( $(cli-shell-api listEffectiveNodes interfaces openvpn) )" ;
+         echo  -n '<vtunN>' ${array[@]##*/}
diff --git a/templates/show/remote-config/openvpn/node.tag/remote-platform/node.def b/templates/show/remote-config/openvpn/node.tag/remote-platform/node.def
new file mode 100644
index 0000000..15502c9
--- /dev/null
+++ b/templates/show/remote-config/openvpn/node.tag/remote-platform/node.def
@@ -0,0 +1 @@
+help: Show remote side OpenVPN config for specified platform
diff --git a/templates/show/remote-config/openvpn/node.tag/remote-platform/node.tag/node.def b/templates/show/remote-config/openvpn/node.tag/remote-platform/node.tag/node.def
new file mode 100644
index 0000000..66f334c
--- /dev/null
+++ b/templates/show/remote-config/openvpn/node.tag/remote-platform/node.tag/node.def
@@ -0,0 +1,9 @@
+help: Show remote side OpenVPN config for specified platform
+allowed: echo -n "vyos openvpn"
+
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+         sudo ${vyatta_sbindir}/vyos-openvpn-remoteconfig.pl $4 $6
+     else
+         echo Must be an admin user to run this command.
+     fi
diff --git a/templates/show/snmp/community/node.def b/templates/show/snmp/community/node.def
deleted file mode 100644
index 48e7d1d..0000000
--- a/templates/show/snmp/community/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show status of SNMP community
diff --git a/templates/show/snmp/community/node.tag/host/node.def b/templates/show/snmp/community/node.tag/host/node.def
deleted file mode 100644
index ac7e559..0000000
--- a/templates/show/snmp/community/node.tag/host/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP on remote host
-
diff --git a/templates/show/snmp/community/node.tag/host/node.tag/node.def b/templates/show/snmp/community/node.tag/host/node.tag/node.def
deleted file mode 100644
index b20409d..0000000
--- a/templates/show/snmp/community/node.tag/host/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show status of SNMP on specified host
-allowed: echo -n '<hostname> <x.x.x.x>'
-run: ${vyatta_bindir}/vyatta-show-snmp.pl --community $4 --host $6
diff --git a/templates/show/snmp/community/node.tag/node.def b/templates/show/snmp/community/node.tag/node.def
deleted file mode 100644
index 48aa6ad..0000000
--- a/templates/show/snmp/community/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show status of specified SNMP community
-allowed: ${vyatta_bindir}/vyatta-show-snmp.pl --allowed
-run: ${vyatta_bindir}/vyatta-show-snmp.pl --community="$4"
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.def
deleted file mode 100644
index 91a0aa0..0000000
--- a/templates/show/snmp/mib/ifmib/ifAlias/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifAlias for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
deleted file mode 100644
index 6c5b00a..0000000
--- a/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifAlias for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias $6
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.def
deleted file mode 100644
index 6ec827d..0000000
--- a/templates/show/snmp/mib/ifmib/ifDescr/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifDescr for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
deleted file mode 100644
index 95222de..0000000
--- a/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifDescr for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr $6
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.def
deleted file mode 100644
index 2955c1d..0000000
--- a/templates/show/snmp/mib/ifmib/ifIndex/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifIndex for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
deleted file mode 100644
index f9159ac..0000000
--- a/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifIndex for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex $6
diff --git a/templates/show/snmp/mib/ifmib/node.def b/templates/show/snmp/mib/ifmib/node.def
deleted file mode 100644
index fa309ff..0000000
--- a/templates/show/snmp/mib/ifmib/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP interfaces MIB information
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib
diff --git a/templates/show/snmp/mib/node.def b/templates/show/snmp/mib/node.def
deleted file mode 100644
index de4f01b..0000000
--- a/templates/show/snmp/mib/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show SNMP MIB information
diff --git a/templates/show/snmp/node.def b/templates/show/snmp/node.def
deleted file mode 100644
index 98f4366..0000000
--- a/templates/show/snmp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP on localhost
-run: ${vyatta_bindir}/vyatta-show-snmp.pl
diff --git a/templates/show/snmp/v3/certificates/node.def b/templates/show/snmp/v3/certificates/node.def
deleted file mode 100644
index e66fc0d..0000000
--- a/templates/show/snmp/v3/certificates/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show TSM certificates
-run: files=`sudo ls /etc/snmp/tls/certs/ 2> /dev/null`;
-  if [ -n "$files" ]; then
-    sudo /usr/bin/net-snmp-cert showcerts --subject --fingerprint
-  else
-    echo "You don't have any certificates. Put it in '/etc/snmp/tls/certs/' folder."
-  fi
diff --git a/templates/show/snmp/v3/group/node.def b/templates/show/snmp/v3/group/node.def
deleted file mode 100644
index 7ff947a..0000000
--- a/templates/show/snmp/v3/group/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured groups
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --group
\ No newline at end of file
diff --git a/templates/show/snmp/v3/node.def b/templates/show/snmp/v3/node.def
deleted file mode 100644
index 70c0df2..0000000
--- a/templates/show/snmp/v3/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP v3 on localhost
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --all
\ No newline at end of file
diff --git a/templates/show/snmp/v3/trap-target/node.def b/templates/show/snmp/v3/trap-target/node.def
deleted file mode 100644
index 9f0d2f1..0000000
--- a/templates/show/snmp/v3/trap-target/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured targets
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --trap
diff --git a/templates/show/snmp/v3/user/node.def b/templates/show/snmp/v3/user/node.def
deleted file mode 100644
index 621ccc8..0000000
--- a/templates/show/snmp/v3/user/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured users
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --user
diff --git a/templates/show/snmp/v3/view/node.def b/templates/show/snmp/v3/view/node.def
deleted file mode 100644
index 7e05d84..0000000
--- a/templates/show/snmp/v3/view/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured views
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --view
\ No newline at end of file
diff --git a/templates/show/system/image/node.def b/templates/show/system/image/node.def
index 08caab7..0766094 100644
--- a/templates/show/system/image/node.def
+++ b/templates/show/system/image/node.def
@@ -1,2 +1,2 @@
-help: Show installed Vyatta images
+help: Show installed VyOS images
 run: /opt/vyatta/bin/vyatta-boot-image.pl --show
diff --git a/templates/show/tech-support/brief/node.def b/templates/show/tech-support/brief/node.def
index 23f588e..9a4a624 100644
--- a/templates/show/tech-support/brief/node.def
+++ b/templates/show/tech-support/brief/node.def
@@ -1,7 +1,7 @@
-help: Show brief tech-support report
+help: Show brief tech-support report (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief 
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/brief/save-uncompressed/node.def b/templates/show/tech-support/brief/save-uncompressed/node.def
index 7d36614..84b4ed0 100644
--- a/templates/show/tech-support/brief/save-uncompressed/node.def
+++ b/templates/show/tech-support/brief/save-uncompressed/node.def
@@ -1,7 +1,7 @@
-help: Save uncompressed brief tech-support report
+help: Save uncompressed brief tech-support report (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed 
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def b/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def
index f1a94c3..dad3949 100644
--- a/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def
+++ b/templates/show/tech-support/brief/save-uncompressed/node.tag/node.def
@@ -1,8 +1,8 @@
-help: Save uncompressed brief tech-support report to specified path/file
+help: Save uncompressed brief tech-support report to specified path/file (private information removed)
 allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed $5 
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed $5 | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/brief/save/node.def b/templates/show/tech-support/brief/save/node.def
index 966a984..2f8a561 100644
--- a/templates/show/tech-support/brief/save/node.def
+++ b/templates/show/tech-support/brief/save/node.def
@@ -1,7 +1,7 @@
-help: Save brief tech-support report
+help: Save brief tech-support report (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/brief/save/node.tag/node.def b/templates/show/tech-support/brief/save/node.tag/node.def
index bf6d45f..f0cfe4a 100644
--- a/templates/show/tech-support/brief/save/node.tag/node.def
+++ b/templates/show/tech-support/brief/save/node.tag/node.def
@@ -1,8 +1,8 @@
-help: Save compressed brief tech-support report to specified path/file
+help: Save compressed brief tech-support report to specified path/file (private information removed)
 allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save $5 
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save $5 | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/node.def b/templates/show/tech-support/node.def
index 34d8e22..c211e90 100644
--- a/templates/show/tech-support/node.def
+++ b/templates/show/tech-support/node.def
@@ -1,7 +1,7 @@
-help: Show consolidated tech-support report
+help: Show consolidated tech-support report (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support | strip-private
      else
        echo Must be an admin user to run this command
      fi 
diff --git a/templates/show/tech-support/private/brief/node.def b/templates/show/tech-support/private/brief/node.def
new file mode 100644
index 0000000..cc06ccf
--- /dev/null
+++ b/templates/show/tech-support/private/brief/node.def
@@ -0,0 +1,7 @@
+help: Show brief tech-support report (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief 
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/brief/save-uncompressed/node.def b/templates/show/tech-support/private/brief/save-uncompressed/node.def
new file mode 100644
index 0000000..9292428
--- /dev/null
+++ b/templates/show/tech-support/private/brief/save-uncompressed/node.def
@@ -0,0 +1,7 @@
+help: Save uncompressed brief tech-support report (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed 
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/brief/save-uncompressed/node.tag/node.def b/templates/show/tech-support/private/brief/save-uncompressed/node.tag/node.def
new file mode 100644
index 0000000..0976413
--- /dev/null
+++ b/templates/show/tech-support/private/brief/save-uncompressed/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Save uncompressed brief tech-support report to specified path/file (contains private information)
+allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save-uncompressed $5 
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/brief/save/node.def b/templates/show/tech-support/private/brief/save/node.def
new file mode 100644
index 0000000..d069ec2
--- /dev/null
+++ b/templates/show/tech-support/private/brief/save/node.def
@@ -0,0 +1,7 @@
+help: Save brief tech-support report (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/brief/save/node.tag/node.def b/templates/show/tech-support/private/brief/save/node.tag/node.def
new file mode 100644
index 0000000..f56d02e
--- /dev/null
+++ b/templates/show/tech-support/private/brief/save/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Save compressed brief tech-support report to specified path/file (contains private information)
+allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support-brief save $5 
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/node.def b/templates/show/tech-support/private/node.def
new file mode 100644
index 0000000..32b4c15
--- /dev/null
+++ b/templates/show/tech-support/private/node.def
@@ -0,0 +1,7 @@
+help: Show consolidated tech-support report (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support
+     else
+       echo Must be an admin user to run this command
+     fi 
diff --git a/templates/show/tech-support/private/save-uncompressed/node.def b/templates/show/tech-support/private/save-uncompressed/node.def
new file mode 100644
index 0000000..424e78a
--- /dev/null
+++ b/templates/show/tech-support/private/save-uncompressed/node.def
@@ -0,0 +1,7 @@
+help: Save consolidated tech-support report uncompressed (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed 
+     else
+      echo Must be an admin user to run this command.
+     fi
diff --git a/templates/show/tech-support/private/save-uncompressed/node.tag/node.def b/templates/show/tech-support/private/save-uncompressed/node.tag/node.def
new file mode 100644
index 0000000..f2f7572
--- /dev/null
+++ b/templates/show/tech-support/private/save-uncompressed/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Save uncompressed tech-support report to specified path/file (contains private information)
+allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed $4
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/save/node.def b/templates/show/tech-support/private/save/node.def
new file mode 100644
index 0000000..87819f6
--- /dev/null
+++ b/templates/show/tech-support/private/save/node.def
@@ -0,0 +1,7 @@
+help: Save consolidated tech-support report (contains private information)
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/private/save/node.tag/node.def b/templates/show/tech-support/private/save/node.tag/node.def
new file mode 100644
index 0000000..5a7b500
--- /dev/null
+++ b/templates/show/tech-support/private/save/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Save compressed tech-support report to the specified path/file (contains private information)
+allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>' 
+run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
+     then
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save $4
+     else
+       echo Must be an admin user to run this command
+     fi
diff --git a/templates/show/tech-support/save-uncompressed/node.def b/templates/show/tech-support/save-uncompressed/node.def
index 4036eaf..4d828f1 100644
--- a/templates/show/tech-support/save-uncompressed/node.def
+++ b/templates/show/tech-support/save-uncompressed/node.def
@@ -1,7 +1,7 @@
-help: Save consolidated tech-support report uncompressed 
+help: Save consolidated tech-support report uncompressed (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed 
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed | strip-private
      else
       echo Must be an admin user to run this command.
      fi
diff --git a/templates/show/tech-support/save-uncompressed/node.tag/node.def b/templates/show/tech-support/save-uncompressed/node.tag/node.def
index 8a637c6..4006afe 100644
--- a/templates/show/tech-support/save-uncompressed/node.tag/node.def
+++ b/templates/show/tech-support/save-uncompressed/node.tag/node.def
@@ -1,8 +1,8 @@
-help: Save uncompressed tech-support report to specified path/file
+help: Save uncompressed tech-support report to specified path/file (private information removed)
 allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed $4
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed $4 | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/save/node.def b/templates/show/tech-support/save/node.def
index 54635d6..ee1a2f1 100644
--- a/templates/show/tech-support/save/node.def
+++ b/templates/show/tech-support/save/node.def
@@ -1,7 +1,7 @@
-help: Save consolidated tech-support report
+help: Save consolidated tech-support report (private information removed)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support save
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/tech-support/save/node.tag/node.def b/templates/show/tech-support/save/node.tag/node.def
index 26e91a0..675418b 100644
--- a/templates/show/tech-support/save/node.tag/node.def
+++ b/templates/show/tech-support/save/node.tag/node.def
@@ -1,8 +1,8 @@
-help: Save compressed tech-support report to the specified path/file
-allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>' 
+help: Save compressed tech-support report to the specified path/file (private information removed)
+allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
      then
-       source ${vyatta_datadir}/vyatta-op/functions/tech-support save $4
+       source ${vyatta_datadir}/vyatta-op/functions/tech-support save $4 | strip-private
      else
        echo Must be an admin user to run this command
      fi
diff --git a/templates/show/users/node.def b/templates/show/users/node.def
deleted file mode 100644
index f7b2e87..0000000
--- a/templates/show/users/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show user information
-run: who -H
diff --git a/templates/show/users/recent/node.def b/templates/show/users/recent/node.def
deleted file mode 100644
index 9199d6d..0000000
--- a/templates/show/users/recent/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show 10 recently logged in users
-run: last -aF -n 10 | sed -e "s/^wtmp begins/Displaying logins since/"
diff --git a/templates/show/users/recent/node.tag/node.def b/templates/show/users/recent/node.tag/node.def
deleted file mode 100644
index a37e6e0..0000000
--- a/templates/show/users/recent/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show specified number of recently logged in users
-allowed: echo -n '<NUMBER>'
-run: last -aF -n $4 | sed -e "s/^wtmp begins/Displaying logins since/"
diff --git a/templates/show/version/added/node.def b/templates/show/version/added/node.def
deleted file mode 100644
index 2381b74..0000000
--- a/templates/show/version/added/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus added packages
-run: ${vyatta_bindir}/vyatta-show-version added
diff --git a/templates/show/version/all/node.def b/templates/show/version/all/node.def
deleted file mode 100644
index 5b60609..0000000
--- a/templates/show/version/all/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus all packages changes
-run: ${vyatta_bindir}/vyatta-show-version all
diff --git a/templates/show/version/deleted/node.def b/templates/show/version/deleted/node.def
deleted file mode 100644
index d328cf6..0000000
--- a/templates/show/version/deleted/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus deleted packages
-run: ${vyatta_bindir}/vyatta-show-version deleted
diff --git a/templates/show/version/downgraded/node.def b/templates/show/version/downgraded/node.def
deleted file mode 100644
index 250b048..0000000
--- a/templates/show/version/downgraded/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus downgraded packages
-run: ${vyatta_bindir}/vyatta-show-version downgraded
diff --git a/templates/show/version/node.def b/templates/show/version/node.def
deleted file mode 100644
index 4237e5d..0000000
--- a/templates/show/version/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information
-run: ${vyatta_bindir}/vyatta-show-version
diff --git a/templates/show/version/upgraded/node.def b/templates/show/version/upgraded/node.def
deleted file mode 100644
index b693c23..0000000
--- a/templates/show/version/upgraded/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus upgraded packages
-run: ${vyatta_bindir}/vyatta-show-version upgraded