diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-04-30 12:54:44 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-04-30 12:54:44 +0000 |
| commit | a91a164fb5e43b03e6533d638f14aed01535c8ba (patch) | |
| tree | e3f0c3c25f48a691ec4e157a55b177cf79b8dec4 | |
| parent | ebf781611af8b3be1e02b11a263cbc1164cbc0fe (diff) | |
| download | drakx-a91a164fb5e43b03e6533d638f14aed01535c8ba.tar drakx-a91a164fb5e43b03e6533d638f14aed01535c8ba.tar.gz drakx-a91a164fb5e43b03e6533d638f14aed01535c8ba.tar.bz2 drakx-a91a164fb5e43b03e6533d638f14aed01535c8ba.tar.xz drakx-a91a164fb5e43b03e6533d638f14aed01535c8ba.zip | |
do not try to configure dvd devices during install since /dev is wiped out at reboot
| -rw-r--r-- | perl-install/any.pm | 15 | ||||
| -rw-r--r-- | perl-install/devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 1 |
4 files changed, 2 insertions, 17 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 751a8392e..be6dc6825 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1261,21 +1261,6 @@ sub alloc_raw_device { $raw_dev; } -sub config_dvd { - my ($prefix) = @_; - - my @dvds = grep { detect_devices::isDvdDrive($_) } detect_devices::cdroms() or return; - - log::l("configuring DVD: " . join(" ", map { $_->{device} } @dvds)); - #- create /dev/dvd symlink - each_index { - devices::symlink_now_and_register($_, 'dvd' . ($::i ? $::i + 1 : '')); - } @dvds; - - my $raw_dev = alloc_raw_device($prefix, 'dvd'); - symlink($raw_dev, "$prefix/dev/rdvd"); -} - sub config_mtools { my ($prefix) = @_; my $file = "$prefix/etc/mtools.conf"; diff --git a/perl-install/devices.pm b/perl-install/devices.pm index be31387e3..61c5b18dd 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -210,7 +210,7 @@ sub symlink_now_and_register { #- add a specific udev script, we can't do it with a udev rule, #- eg, ttySL0 is a symlink output_with_perm("$::prefix/etc/udev/conf.d/$of.conf", 0755, "ln -sf $if /dev/$of\n") - if $of !~ /dvd|mouse/; + if $of !~ /mouse/; symlinkf($if, "$::prefix/dev/$of"); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index be96e2c54..3badb7bbd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- do not try to configure dvd devices since /dev is wiped out at reboot - allow umounting cdrom during a transaction - really allow having name with "/" in media.cfg diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index dfd91646e..4ebeec8e0 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -453,7 +453,6 @@ Consoles 1,3,4,7 may also contain interesting information"; #- for mandrake_firstime touch "$::prefix/var/lock/TMP_1ST"; - any::config_dvd($::prefix); any::config_mtools($::prefix); #- make sure wins is disabled in /etc/nsswitch.conf |