diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-10-17 14:46:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-10-17 14:46:23 +0000 |
| commit | 63d3fd5d25fd96cd428456099b9b2353db4e10cc (patch) | |
| tree | a484287726bab4952922ac0a009752ce9e066076 /perl-install/harddrake/data.pm | |
| parent | cae1ccd930601ee56c8c58adbaa932fc82fcce03 (diff) | |
| download | drakx-63d3fd5d25fd96cd428456099b9b2353db4e10cc.tar drakx-63d3fd5d25fd96cd428456099b9b2353db4e10cc.tar.gz drakx-63d3fd5d25fd96cd428456099b9b2353db4e10cc.tar.bz2 drakx-63d3fd5d25fd96cd428456099b9b2353db4e10cc.tar.xz drakx-63d3fd5d25fd96cd428456099b9b2353db4e10cc.zip | |
- printerdrake::auto_detect(local, net, smb):
o split into local_detect, net_detect, net_smb_detect
o detect: return all printers
- printer: consolidate all *help_output into help_output
Diffstat (limited to 'perl-install/harddrake/data.pm')
| -rw-r--r-- | perl-install/harddrake/data.pm | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index bcc294d17..3554184fb 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -27,15 +27,10 @@ our @tree = ["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners, 0 ], ["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ], ["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ], - - ["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", - sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ], - ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", - sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ], - ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", - sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ], - ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", - sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ], + ["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ], + ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ], + ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ], + ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ], ["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ], ["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ], ["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub { @@ -50,13 +45,8 @@ our @tree = ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ], ["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ], - ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", - sub { - require class_discard; - require printerdrake; printerdrake::auto_detect(class_discard->new) } , 0 ], - ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", - sub { - require scanner; scanner::detect() }, 0 ], + ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", sub { require printerdrake; printerdrake::detect() } , 0 ], + ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::detect() }, 0 ], ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { require mouse; require modules; |