summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2016-02-02 07:01:19 -0500
committerKim Hagen <kim.sidney@gmail.com>2016-02-02 07:01:19 -0500
commit343416f754182b1b0bc8025ea0f700bb38d1cd9c (patch)
tree702bd18a412d1ceff91d94c93a02828a34bafea0
parent25afab110cd193a58aa86a19f808aaa620671e33 (diff)
downloadlive-boot-343416f754182b1b0bc8025ea0f700bb38d1cd9c.tar.gz
live-boot-343416f754182b1b0bc8025ea0f700bb38d1cd9c.zip
Get mountpoint of persistent device and use it in vyos script.
-rwxr-xr-xcomponents/9990-misc-helpers.sh2
-rwxr-xr-xcomponents/9990-vyos.sh2
2 files changed, 3 insertions, 1 deletions
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