From 413b9c6c514ae9bd1d35566677b6eb0b740122ca Mon Sep 17 00:00:00 2001
From: thomas <kreitler@molgen.mpg.de>
Date: Mon, 21 Jan 2019 13:49:30 +0100
Subject: [PATCH] mxraid_assemble: Store size of device

---
 mxraid/mxraid_assemble | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble
index d9461d3..82150ac 100755
--- a/mxraid/mxraid_assemble
+++ b/mxraid/mxraid_assemble
@@ -134,7 +134,7 @@ if ($opts{l}) {
       my $md = $hd->mddev_by_member()->{$rec->[0]};
       $md = 'n/a' unless defined $md;
       $reg{$md}+=1;
-      printf "     %-5s %-9s %-16s '%s'\n", $md, @$rec;
+      printf "     %-5s %-9s %-16s '%s'\n", $md, @$rec[0..2];
     }
     print "  Note: this doesn't look like a standard configuration.\n" if scalar keys %reg != 1;
     print "\n";
@@ -144,7 +144,7 @@ if ($opts{l}) {
     print "Disks not part of a configured SW-RAID:\n";
     for my $rec (@{$hd->non_raid_disks()}) {
       my $mnt = scalar(grep {m|^/dev/$rec->[0]\d*\b|} @mounts) ? ' (mounted)':'';
-      printf "           %-9s %-16s '%s'%s\n", @$rec, $mnt;
+      printf "           %-9s %-16s '%s'%s\n", @$rec[0..2], $mnt;
     }
     print "\n";
   }
@@ -668,6 +668,7 @@ exit;
       my ($dk) = $dev_list->[$i] =~ m|([^/]+)$|;
 
       my $model = sys_fs_get_prop('/sys/block/'.$dk.'/device/model');
+      my $sizeb = sys_fs_get_prop('/sys/block/'.$dk.'/size') * 512;
 
       # if (! -e '/sys/block/'.$dk.'/device/vpd_pg80') {
       #   warn "# Note failed to read serial via sysfs ($dk).\n" if $self->{verbose};
@@ -697,7 +698,7 @@ exit;
         if ($short_info) {
           push @ret, $serial_number;
         } else {
-          push @ret, [$dk, $serial_number, $model];
+          push @ret, [$dk, $serial_number, $model, $sizeb];
         }
       }
     }