From 61a4823d73d8a12e0f750edafaa1faabeb78e9af Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 25 Jul 2014 10:05:40 +0200 Subject: Fix is_live_boot check to account for the overlayfs change. --- scripts/install/install-functions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/install') 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 -- cgit v1.2.3