]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_scrub_all: use system encoding for lsblk output decoding
authorDarrick J. Wong <darrick.wong@oracle.com>
Thu, 12 Apr 2018 15:34:11 +0000 (10:34 -0500)
committerEric Sandeen <sandeen@redhat.com>
Thu, 12 Apr 2018 15:34:11 +0000 (10:34 -0500)
Don't hardcode utf-8 as the decoding scheme for lsblk output, since the
system could set it to anything else.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
scrub/xfs_scrub_all.in

index 83c4e21847faf175a22e7e84dd48da48c47748a7..d374f9227fdfc969abdc35475663d399bba08f79 100644 (file)
@@ -48,7 +48,7 @@ def find_mounts():
        result.wait()
        if result.returncode != 0:
                return fs
-       sarray = [x.decode('utf-8') for x in result.stdout.readlines()]
+       sarray = [x.decode(sys.stdout.encoding) for x in result.stdout.readlines()]
        output = ' '.join(sarray)
        bdevdata = json.loads(output)
        # The lsblk output had better be in disks-then-partitions order