diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-04-12 10:34:11 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-04-12 10:34:11 -0500 |
| commit | 74aed9c82b4b48d2a4be6ee3a72a38fdcc6d5a58 (patch) | |
| tree | cc091de4a0cf8c6624cfa2dd29bc99c78dd609f5 | |
| parent | 07c6fd5956da012539ea876787ea1227cf1e8857 (diff) | |
| download | xfsprogs-dev-74aed9c82b4b48d2a4be6ee3a72a38fdcc6d5a58.tar.gz | |
xfs_scrub_all: use system encoding for lsblk output decoding
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>
| -rw-r--r-- | scrub/xfs_scrub_all.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in index 83c4e21847..d374f9227f 100644 --- a/scrub/xfs_scrub_all.in +++ b/scrub/xfs_scrub_all.in @@ -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 |