frodovdr/raspberrymatic-addon-rmupdate
1
0
Fork 0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Show disk model

Browse Source
This commit is contained in:
Jan Schneider 2018-02-28 01:23:54 +01:00
parent 292219ccba
commit 5ebadb2ed1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addon/lib/rmupdate.tcl
View File

@ -274,12 +274,15 @@ proc ::rmupdate::get_partitions {{device ""}} {
if {[regexp {Disk\s+(\S+):.*\s(\d+)\s+bytes} $d match dev size]} { if {[regexp {Disk\s+(\S+):.*\s(\d+)\s+bytes} $d match dev size]} {
set partitions(${dev}::0::partition) 0 set partitions(${dev}::0::partition) 0
set partitions(${dev}::0::disk_device) $dev set partitions(${dev}::0::disk_device) $dev
set partitions(${dev}::0::model) ""
set partitions(${dev}::0::size) $size set partitions(${dev}::0::size) $size
set data2 "" set data2 ""
catch {set data2 [exec /usr/sbin/parted $dev unit B print]} catch {set data2 [exec /usr/sbin/parted $dev unit B print]}
foreach d2 [split $data2 "\n"] { foreach d2 [split $data2 "\n"] {
if {[regexp {^\s*(\d)\s+(\d+)B\s+(\d+)B\s+(\d+)B.*} $d2 match num start end size]} { if {[regexp {^Model:\s*(\S.*)\s*$} $d2 match model]} {
set partitions(${dev}::0::model) $model
} elseif {[regexp {^\s*(\d)\s+(\d+)B\s+(\d+)B\s+(\d+)B.*} $d2 match num start end size]} {
set partitions(${dev}::${num}::partition) $num set partitions(${dev}::${num}::partition) $num
set partitions(${dev}::${num}::disk_device) $dev set partitions(${dev}::${num}::disk_device) $dev
set part_dev [get_partition_device $dev $num] set part_dev [get_partition_device $dev $num]

3
addon/www/index.html
View File

@ -407,7 +407,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
if (partition.partition == 0) { if (partition.partition == 0) {
var st = "border:none; border-top: 2px solid #aaafaf"; var st = "border:none; border-top: 2px solid #aaafaf";
$("#volume-info tbody").append($('<tr style="background: #f8ffff;">').append( $("#volume-info tbody").append($('<tr style="background: #f8ffff;">').append(
$('<td style="'+st+'" class="top aligned" rowspan="' + parts.length + '">').append($('<label>' + partition.disk_device + '</label>')), $('<td style="'+st+'" class="top aligned" rowspan="' + parts.length + '">')
.append($('<label>' + partition.model + '</label><br /><strong>' + partition.disk_device + '</strong>')),
$('<td style="'+st+'" class="center aligned" colspan="4">'), $('<td style="'+st+'" class="center aligned" colspan="4">'),
$('<td style="'+st+'">').append($('<label>' + format_size(partition.size) + '</label>')), $('<td style="'+st+'">').append($('<label>' + format_size(partition.size) + '</label>')),
$('<td style="'+st+'">'), $('<td style="'+st+'">'),