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

Fix version reading, filter /dev/ram devices

Browse Source
This commit is contained in:
Jan Schneider 2018-04-28 21:36:26 +02:00
parent 02acb8cb12
commit 0c8d7c2bd9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addon/lib/rmupdate.tcl
View File

@ -279,6 +279,9 @@ proc ::rmupdate::get_partitions {{device ""}} {
foreach d [split $data "\n"] { foreach d [split $data "\n"] {
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]} {
if {[regexp {/dev/ram} $dev]} {
continue
}
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::model) ""
@ -1016,7 +1019,7 @@ proc ::rmupdate::get_current_firmware_version {} {
} }
set data [read $fp] set data [read $fp]
close $fp close $fp
regexp {\s*VERSION\s*=\s*([\d\.]+)\s*$} $data match current_version regexp {\s*VERSION\s*=\s*([\d\.]+)\s*} $data match current_version
return $current_version return $current_version
} }