diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-10-27 10:04:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 10:04:12 +0100 |
| commit | 7c097669f7eee4afb0436e5da52eb309c100bb0e (patch) | |
| tree | 1e28d3cd8b9c29e76a145bdc8754fbb85016ea6b | |
| parent | e10e8af4192856232ae3710b486cff097490ebc6 (diff) | |
| parent | 3888ca9ea52b126d0b15dd35e5c0c530b13fb377 (diff) | |
| download | vyatta-op-7c097669f7eee4afb0436e5da52eb309c100bb0e.tar.gz vyatta-op-7c097669f7eee4afb0436e5da52eb309c100bb0e.zip | |
Merge pull request #77 from vyos/mergify/bp/sagitta/pr-76
T5690: change to definition of environment variable 'vyos_rootfs_dir' is incorrect (backport #76)
| -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 |