diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-07-25 10:05:40 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-07-25 10:05:40 +0200 |
| commit | 61a4823d73d8a12e0f750edafaa1faabeb78e9af (patch) | |
| tree | 4c720d1679014e2a3d1d07a0cbb6dc7d8227ad6e /scripts | |
| parent | c3b390629699257cc7aaedebcad419bd8c9c8bbf (diff) | |
| download | vyatta-cfg-system-61a4823d73d8a12e0f750edafaa1faabeb78e9af.tar.gz vyatta-cfg-system-61a4823d73d8a12e0f750edafaa1faabeb78e9af.zip | |
Fix is_live_boot check to account for the overlayfs change.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-functions | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 1929d1b3..90355974 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -271,7 +271,10 @@ is_disk_based_boot() # returns true if it's a live cd boot is_live_cd_boot () { - if grep -q ' /live/image [^ ]\+ ro' /proc/mounts; then + # Poor check, but whatever. The point is that on installed system + # the image file normally is named after the current version, + # while on livecd it's just "filesystem.squashfs" + if grep -q -e '^overlayfs.*/filesystem.squashfs' /proc/mounts; then return 0 else return 1 |