X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fmedia.cgi;h=5753bc301dfdcb7a74e7c543e077a9c0b30e27ce;hb=8288c0394bb96f5aa3878ea86c05c2d92d677347;hp=9dea789f33b78fc8c083dcb559cada684f026e09;hpb=36d809efb637c618359f40c1ecd8d820fcb2c882;p=ipfire-2.x.git diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 9dea789f33..5753bc301d 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'hour' unless defined $querry[1]; -my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`; +my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^nvme|^xvd|^vd|^md' | sort | uniq`; -if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){ +if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "nvme?n?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){ print "Content-type: image/png\n\n"; binmode(STDOUT); @@ -152,7 +152,7 @@ END for(my $i = 1; $i <= $#iostat1; $i++){ if ( $i eq '1' ){ - print "$Lang::tr{'device'}$Lang::tr{'MB read'}$Lang::{'MB writen'}"; + print "$Lang::tr{'device'}$Lang::tr{'MB read'}$Lang::tr{'MB written'}"; }else{ print "$iostat1[$i]$iostat2[$i]$iostat3[$i]"; }