diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-06-05 16:54:44 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-06-05 16:54:44 +0000 |
| commit | f4ad582b9636b4ade9a332380a7a15d75a92b429 (patch) | |
| tree | 010742a79ce7bc1b238ef4182b9aedfb4bda8f75 | |
| parent | 1f62beedf81f47538f0610a8f5cd7e4f52f2dca1 (diff) | |
| download | drakx-backup-do-not-use-f4ad582b9636b4ade9a332380a7a15d75a92b429.tar drakx-backup-do-not-use-f4ad582b9636b4ade9a332380a7a15d75a92b429.tar.gz drakx-backup-do-not-use-f4ad582b9636b4ade9a332380a7a15d75a92b429.tar.bz2 drakx-backup-do-not-use-f4ad582b9636b4ade9a332380a7a15d75a92b429.tar.xz drakx-backup-do-not-use-f4ad582b9636b4ade9a332380a7a15d75a92b429.zip | |
added DVD support, only first try to detect a DVD drive and rpmsrate is not
updated.
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 7d1133c71..c2be7e1e8 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -51,6 +51,7 @@ sub cdroms() { } sub burners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } get() } sub IDEburners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } getIDE() } +sub dvdroms { grep { $_->{type} eq 'cdrom' && isDvdDrive($_) } get() } sub get_mac_model() { my $mac_model = cat_("/proc/device-tree/model") || die "Can't open /proc/device-tree/model"; @@ -78,6 +79,7 @@ sub isBurner { $f && c::isBurner(fileno($f)); } } +sub isDvdDrive { $_[0]->{info} =~ /DVD/ } sub isZipDrive { $_[0]->{info} =~ /ZIP\s+\d+/ } #- accept ZIP 100, untested for bigger ZIP drive. #-sub isJazzDrive { $_[0]->{info} =~ /JAZZ?\s+/ } #- untested. sub isLS120Drive { $_[0]->{info} =~ /LS-?120|144MB/ } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 6dba93a48..83d804530 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -356,6 +356,7 @@ sub setPackages { $o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall(); $o->{compssUsersChoice}{SYSTEM} = 1; $o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners(); + $o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms(); $o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA(); $o->{compssUsersChoice}{'3D'} = 1 if detect_devices::matching_desc('Matrox.* G[24]00') || |