From 343416f754182b1b0bc8025ea0f700bb38d1cd9c Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Tue, 2 Feb 2016 07:01:19 -0500
Subject: Get mountpoint of persistent device and use it in vyos script.

---
 components/9990-misc-helpers.sh | 2 ++
 components/9990-vyos.sh         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'components')

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 44381d9..6d9144c 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1410,6 +1410,8 @@ get_custom_mounts ()
 			fi
 
 			full_source="$(trim_path ${backing}/${LIVE_MEDIA_PATH}/${source})"
+			VYOS_MOUNT="${backing}"
+			export VYOS_MOUNT
 			full_dest="$(trim_path ${rootmnt}/${dir})"
 			if [ -n "${opt_link}" ]
 			then
diff --git a/components/9990-vyos.sh b/components/9990-vyos.sh
index b0afcb5..c5340eb 100755
--- a/components/9990-vyos.sh
+++ b/components/9990-vyos.sh
@@ -28,7 +28,7 @@ fi 2>/dev/null
 #	   but is certainly read-write
 
 
-unioncfgpath="$(trim_path /root/lib/live/mount/medium/${PERSISTENCE_PATH}/rw)"
+unioncfgpath="$(trim_path /root/lib/${VYOS_MOUNT}/${PERSISTENCE_PATH}/rw)"
 
 if [ -d /root/opt/vyatta/etc/config ]
 then
-- 
cgit v1.2.3