diff options
| author | Thomas Jepp <tom@tomjepp.co.uk> | 2016-02-03 20:08:16 +0000 |
|---|---|---|
| committer | Thomas Jepp <tom@tomjepp.co.uk> | 2016-02-03 20:08:16 +0000 |
| commit | f54bad96cef6ed52547151bc3a7ef64377f16c3e (patch) | |
| tree | a9234409c2eb66af7cc9429a110531712fa569c0 /scripts/install | |
| parent | ac29f8f49a1ee620d07c3c6bdaec97afaeb1ad27 (diff) | |
| download | vyatta-cfg-system-f54bad96cef6ed52547151bc3a7ef64377f16c3e.tar.gz vyatta-cfg-system-f54bad96cef6ed52547151bc3a7ef64377f16c3e.zip | |
Add vyos-persistpath and update install-image-existing and vyatta-update-grub.pl to use it.
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-image-existing | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index 1c90df83..4c6b601b 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -110,13 +110,11 @@ fi echo "OK. This image will be named: $NEWNAME" # this is the default if current install is union -BOOT_DIR=/live/image/boot + if [ "$CUR_INSTALL" == 'old' ]; then BOOT_DIR=/boot elif [ "$CUR_INSTALL" == 'union' ]; then - # I'm not proud of this... - BOOT_DEVICE=`grep -o 'upperdir=/live/persistence/[^/]*/boot' /proc/mounts | cut -d / -f 4` - BOOT_DIR="/lib/live/mount/persistence/$BOOT_DEVICE/boot" + BOOT_DIR=`/opt/vyatta/sbin/vyos-persistpath`/boot else echo 'Invalid current install type. Exiting...' exit 1 |