summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-07-25 08:53:56 +0200
committerDaniil Baturin <daniil@baturin.org>2014-07-25 08:53:56 +0200
commitcbdec52be1838f100c05941b30e4f7fca20b5b79 (patch)
treefc95c84547c95972d76ff007e87c063662fadc3d
parent26367b6b340b7bd57b3c32c5ac11a559a0578d6f (diff)
downloadvyatta-op-cbdec52be1838f100c05941b30e4f7fca20b5b79.tar.gz
vyatta-op-cbdec52be1838f100c05941b30e4f7fca20b5b79.zip
Boot type check had unionfs hardcoded in it. Now it has overlayfs hardcoded in it.
This makes me happy.
-rwxr-xr-xscripts/vyatta-show-version4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-show-version b/scripts/vyatta-show-version
index 485e90e..d6ab51a 100755
--- a/scripts/vyatta-show-version
+++ b/scripts/vyatta-show-version
@@ -195,11 +195,11 @@ if ($type) {
print "System type: $type\n";
}
-my $booted = `grep -e '^unionfs.*/filesystem.squashfs' -e '^aufs.*/filesystem.squashfs' /proc/mounts`;
+my $booted = `grep -e '^overlayfs.*/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 = `grep -e '^overlayfs /' /proc/mounts`;
if ($image_boot ne "") {
$booted="image";
} else {