hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

Make {system usbmounts} more generic .

Browse Source
This commit is contained in:
xyz321 2019-02-04 19:52:42 +00:00 committed by HummyPkg
parent f5a205a2af
commit 6eb6f49fea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webif/lib/system.class
View File

@ -707,19 +707,19 @@ proc {system usbmounts} {{full 0}} {
set num 0 set num 0
catch { catch {
set num [ set num [
exec grep -cE {/media/([a-z-]+-)?drive} \ exec grep -cE {^/dev/sd[a-z][1-9] /media/[^/]+ } \
/proc/mounts] /proc/mounts]
} }
return $num return $num
} }
set ret {} set ret {}
if {[catch { if {[catch {
set lines [exec grep -E {media/([a-z-]+-)?drive} \ set lines [exec grep -E {^/dev/sd[a-z][1-9] /media/[^/]+ } \
/proc/mounts] /proc/mounts]
}]} { return $ret } }]} { return $ret }
foreach line [split $lines "\n"] { foreach line [split $lines "\n"] {
lassign $line dev mp lassign $line dev mp
set rec "DEV $dev MP $mp LABEL {NO NAME} TYPE Unknown" set rec "DEV {$dev} MP {$mp} LABEL {NO NAME} TYPE Unknown"
set rec(VENDOR) Unknown set rec(VENDOR) Unknown
set rec(MODEL) Unknown set rec(MODEL) Unknown