From e8cf7aadfa68f64fd15c971ded1209fab9aa96c0 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 26 Oct 2023 14:51:11 -0500 Subject: Revert "T5461: Improve rootfs directory variable" This reverts commit 6b03f6864063bc0ab95191b8c5e418d482baf076. --- etc/default/vyatta.in | 4 ++-- 1 file 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 -- cgit v1.2.3