diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-27 07:42:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 07:42:29 +0200 |
| commit | 542a1ae55d1380087f5f0b15e7e0d49681616692 (patch) | |
| tree | 4dbf206e06aea609838982a7ff3463afe3f61372 | |
| parent | 65b3f560a2d5431dff8be5aa1bf2166fae4bcf38 (diff) | |
| parent | e8cf7aadfa68f64fd15c971ded1209fab9aa96c0 (diff) | |
| download | vyatta-op-542a1ae55d1380087f5f0b15e7e0d49681616692.tar.gz vyatta-op-542a1ae55d1380087f5f0b15e7e0d49681616692.zip | |
Merge pull request #76 from jestabro/env-rootfs-dir
T5690: change to definition of environment variable 'vyos_rootfs_dir' is incorrect
| -rw-r--r-- | etc/default/vyatta.in | 4 |
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 |