diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-01-26 09:09:06 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-01-26 09:09:06 -0500 |
| commit | 13cf05ad949e8e622613b59084a39a776110fa99 (patch) | |
| tree | b4c01b69cc86599d3dec929cd7a81560662a804a | |
| parent | 9530eae60bf66020401e52a5b9cd278f73311128 (diff) | |
| download | vyatta-cfg-system-13cf05ad949e8e622613b59084a39a776110fa99.tar.gz vyatta-cfg-system-13cf05ad949e8e622613b59084a39a776110fa99.zip | |
Update 'is_live_cd_boot' and 'is_union_instal' functions to search on 'overlay' instead of 'overlayfs'
| -rwxr-xr-x | scripts/install/install-functions | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 1551fbb0..8f30f8db 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -274,7 +274,7 @@ is_live_cd_boot () # 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 + if grep -q -e '^overlay.*/filesystem.squashfs' /proc/mounts; then return 0 else return 1 @@ -287,8 +287,8 @@ is_union_install () if is_live_cd_boot; then return 1 fi - if grep -q ' /live/image [^ ]\+ rw' /proc/mounts \ - && egrep -q '(union|overlay)fs / (union|overlay)fs ' /proc/mounts; then + if grep -q 'upperdir=/live/overlay//rw' /proc/mounts \ + && egrep -q 'overlay / overlay ' /proc/mounts; then return 0 else return 1 |