6 files changed, 6 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index ab85087..398c259 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ interp_DATA += functions/interpreter/vyatta-image-complete
 
 
 bin_SCRIPTS = scripts/vyatta-show-interfaces.pl
-bin_SCRIPTS += scripts/show-dhcp-leases.pl
 bin_SCRIPTS += scripts/vyatta-boot-image.pl
 bin_SCRIPTS	+= scripts/rename-image.pl
 bin_SCRIPTS	+= scripts/show-image-storage.pl
diff --git a/etc/default/vyatta.in b/etc/default/vyatta.in
index f496dba..909f124 100644
--- a/etc/default/vyatta.in
+++ b/etc/default/vyatta.in
@@ -137,7 +137,6 @@ unset _vyatta_extglob
 	    declare -x -r vyatta_sysconfdir=$vyatta_prefix/etc
 	fi
     fi
-
     if test -z "$vyatta_op_templates" ; then
 	declare -x -r vyatta_op_templates=$vyatta_datadir/vyatta-op/templates
         declare -x -r vyos_op_templates=$vyatta_datadir/vyatta-op/templates
@@ -163,24 +162,23 @@ unset _vyatta_extglob
     if test -z "$vyos_conf_scripts_dir" ; then
         declare -x -r vyos_conf_scripts_dir=$vyos_libexec_dir/conf_mode
     fi
-
     if test -z "$vyos_op_scripts_dir" ; then
         declare -x -r vyos_op_scripts_dir=$vyos_libexec_dir/op_mode
     fi
-
     if test -z "$vyos_completion_dir" ; then
         declare -x -r vyos_completion_dir=$vyos_libexec_dir/completion
     fi
-
     if test -z "$vyos_validators_dir" ; then
         declare -x -r vyos_validators_dir=$vyos_libexec_dir/validators
     fi
-
+    if test -z "$vyos_persistence_dir" ; then
+        UNION_NAME=$(cat /proc/cmdline | sed -e s+^.*vyos-union=++ | sed -e 's/ .*$//')
+        declare -x -r vyos_persistence_dir="/usr/lib/live/mount/persistence/${UNION_NAME}"
+    fi
     if test -z "$vyos_rootfs_dir" ; then
-        IMAGE_NAME=$(cat /proc/cmdline | sed -e s+^.*vyos-union=/boot/++ | sed -e 's/ .*$//')
-        declare -x -r vyos_rootfs_dir="/usr/lib/live/mount/rootfs/${IMAGE_NAME}.squashfs"
+        ROOTFS=$(mount -t squashfs | grep loop0 | cut -d' ' -f3)
+        declare -x -r vyos_rootfs_dir="${ROOTFS}"
     fi
-
     if test -z "$VRF" ; then
         VRF=$(ip vrf identify)
         [ -n "$VRF" ] && declare -x -r VRF="${VRF}"
@@ -190,7 +188,6 @@ unset _vyatta_extglob
         [ -n "$NETNS" ] && declare -x -r NETNS="${NETNS}"
     fi
 
-
 } 2>/dev/null || :
 
 [ -r /etc/default/vyatta-cfg ] && source /etc/default/vyatta-cfg
diff --git a/templates/generate/node.def b/templates/generate/node.def
deleted file mode 100644
index 383cf80..0000000
--- a/templates/generate/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Generate an object 
diff --git a/templates/generate/tech-support/archive/node.def b/templates/generate/tech-support/archive/node.def
deleted file mode 100644
index 6b1a380..0000000
--- a/templates/generate/tech-support/archive/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Generate tech-support archive
-run: ${vyatta_bindir}/tech-support-archive 
diff --git a/templates/generate/tech-support/archive/node.tag/node.def b/templates/generate/tech-support/archive/node.tag/node.def
deleted file mode 100644
index 540331f..0000000
--- a/templates/generate/tech-support/archive/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Generate compressed tech-support archive at the specified path
-allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>'
-run: ${vyatta_bindir}/tech-support-archive "$4" 
-
diff --git a/templates/generate/tech-support/node.def b/templates/generate/tech-support/node.def
deleted file mode 100644
index 27d1937..0000000
--- a/templates/generate/tech-support/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Generate tech-support archive