summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-10-26 14:51:11 -0500
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-10-27 05:42:53 +0000
commit3888ca9ea52b126d0b15dd35e5c0c530b13fb377 (patch)
tree4dbf206e06aea609838982a7ff3463afe3f61372 /etc
parent3c7cfc68a49af6e6f537c6798566103c2b2114d3 (diff)
downloadvyatta-op-3888ca9ea52b126d0b15dd35e5c0c530b13fb377.tar.gz
vyatta-op-3888ca9ea52b126d0b15dd35e5c0c530b13fb377.zip
Revert "T5461: Improve rootfs directory variable"
This reverts commit 6b03f6864063bc0ab95191b8c5e418d482baf076. (cherry picked from commit e8cf7aadfa68f64fd15c971ded1209fab9aa96c0)
Diffstat (limited to 'etc')
-rw-r--r--etc/default/vyatta.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/default/vyatta.in b/etc/default/vyatta.in
index f496dba..1c7759e 100644
--- a/etc/default/vyatta.in
+++ b/etc/default/vyatta.in
@@ -177,8 +177,8 @@ unset _vyatta_extglob
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 | cut -d' ' -f3)
+ declare -x -r vyos_rootfs_dir="${ROOTFS}"
fi
if test -z "$VRF" ; then