89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From c77c14ecd3e7e35a331cef169b08ffcb318952c2 Mon Sep 17 00:00:00 2001
|
|
From: Shane Bradley <sbradley@redhat.com>
|
|
Date: Tue, 20 Jan 2015 11:08:59 -0500
|
|
Subject: [PATCH] [block] don't use parted human readable output
|
|
|
|
Changed the parted command to return data in sectors units
|
|
instead of human readable form.
|
|
|
|
Fixes #471.
|
|
|
|
Signed-off-by: Shane Bradley <sbradley@redhat.com>
|
|
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
---
|
|
sos/plugins/block.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/sos/plugins/block.py b/sos/plugins/block.py
|
|
index 7984f0d..e02304c 100644
|
|
--- a/sos/plugins/block.py
|
|
+++ b/sos/plugins/block.py
|
|
@@ -46,7 +46,7 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
|
|
disk_path = os.path.join('/dev/', disk)
|
|
self.add_cmd_output([
|
|
"udevadm info -ap /sys/block/%s" % (disk),
|
|
- "parted -s %s print" % (disk_path),
|
|
+ "parted -s %s unit s print" % (disk_path),
|
|
"fdisk -l %s" % disk_path
|
|
])
|
|
|
|
--
|
|
1.8.3.1
|
|
|