From 1c81fabd916f42586199561cd81f3cad1f40cbb9 Mon Sep 17 00:00:00 2001 From: James Davidson Date: Fri, 19 Oct 2012 16:26:34 -0700 Subject: Support detection of overlayfs --- scripts/vyatta-show-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vyatta-show-version b/scripts/vyatta-show-version index fa4de0d..b3c6782 100755 --- a/scripts/vyatta-show-version +++ b/scripts/vyatta-show-version @@ -190,11 +190,11 @@ if ($type) { print "System type: $type\n"; } -my $booted = `grep -e '^unionfs.*/filesystem.squashfs' -e '^aufs.*/filesystem.squashfs' /proc/mounts`; +my $booted = `egrep -e '^(union|overlay|au)fs.*/filesystem\.squashfs' /proc/mounts`; if (defined($booted) && $booted ne "") { $booted="livecd"; } else { - my $image_boot = `grep -e '^unionfs / unionfs.*squashfs=ro' /proc/mounts`; + my $image_boot = `egrep -e '^(union|overlay)fs / (union|overlay)fs.*\.squashfs' /proc/mounts`; if ($image_boot ne "") { $booted="image"; } else { -- cgit v1.2.3