git-svn-id: http://svn.calculate.ru/calculate/trunk@2357 c91db197-33c1-4113-bf15-f8a5c547ca64

master
atratsevskiy 15 years ago
parent ae3c3d89cf
commit 9f2446d76f

@ -1679,7 +1679,7 @@ sub checksystem{
if($drv && !$data{video_drv}){$data{video_drv} = $drv} if($drv && !$data{video_drv}){$data{video_drv} = $drv}
if($data{video}){ if($data{video} && !$data{builder}){
printmes(" ".gettext('Videocard')); printmes(" ".gettext('Videocard'));
printmes(": $data{video}\n"); printmes(": $data{video}\n");
} }
@ -1742,8 +1742,7 @@ sub checksystem{
my $log = join /\n/, @xconf; my $log = join /\n/, @xconf;
if($log=~m/Modes "([^\s"]+)[\s"]/){$data{video_resolution} = "$1";} if($log=~m/Modes "([^\s"]+)[\s"]/){$data{video_resolution} = "$1";}
} }
if($data{video_resolution} && !$data{builder}){
if($data{video_resolution}){
printmes(" ".gettext('Screen resolution')); printmes(" ".gettext('Screen resolution'));
printmes(": $data{video_resolution}\n"); printmes(": $data{video_resolution}\n");
} }
@ -2287,7 +2286,7 @@ sub checksystem{
open(F, $fstab); open(F, $fstab);
($data{mount_dev}, $data{mountdir}, $data{mount_line}) = getdisk_fstab(<F>); ($data{mount_dev}, $data{mountdir}, $data{mount_line}) = getdisk_fstab(<F>);
close(F); close(F);
if(@{$data{mount_dev}}){ if(@{$data{mount_dev}} && !$data{builder}){
printmes(" ".gettext('Mounted disks')); printmes(": @{$data{mount_dev}}\n"); printmes(" ".gettext('Mounted disks')); printmes(": @{$data{mount_dev}}\n");
} }
} }

Loading…
Cancel
Save