diff options
| author | James Davidson <james.davidson@vyatta.com> | 2012-10-19 16:26:34 -0700 |
|---|---|---|
| committer | James Davidson <james.davidson@vyatta.com> | 2012-10-19 16:26:34 -0700 |
| commit | 1c81fabd916f42586199561cd81f3cad1f40cbb9 (patch) | |
| tree | fa1672e1b786c06807387ad61cfad194be56a9a2 | |
| parent | ce07c8fa075361a25cff94033975255fa12e0c8b (diff) | |
| download | vyatta-op-1c81fabd916f42586199561cd81f3cad1f40cbb9.tar.gz vyatta-op-1c81fabd916f42586199561cd81f3cad1f40cbb9.zip | |
Support detection of overlayfs
| -rwxr-xr-x | scripts/vyatta-show-version | 4 |
1 files 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 { |