diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-25 12:14:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-25 12:14:11 +0000 |
| commit | 7f5508ce30ddb89239136c5d81c4b3e8368351c0 (patch) | |
| tree | b4f4a3e186c60a4d7a540024770e2f261ee5244f /perl-install/install_any.pm | |
| parent | 21499786291db824f9745f4c0875eded9d44370d (diff) | |
| download | drakx-7f5508ce30ddb89239136c5d81c4b3e8368351c0.tar drakx-7f5508ce30ddb89239136c5d81c4b3e8368351c0.tar.gz drakx-7f5508ce30ddb89239136c5d81c4b3e8368351c0.tar.bz2 drakx-7f5508ce30ddb89239136c5d81c4b3e8368351c0.tar.xz drakx-7f5508ce30ddb89239136c5d81c4b3e8368351c0.zip | |
we don't use /tmp for devices anymore
(this comes from long ago when redhat code was using a ro /dev and creating other devices in /tmp)
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index bc198bacf..b4ee7c6e2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -151,7 +151,7 @@ sub errorOpeningFile($) { my $max = 32; #- always refuse after $max tries. if ($current_method eq "cdrom") { - cat_("/proc/mounts") =~ m,(/(?:dev|tmp)/\S+)\s+(/mnt/cdrom|/tmp/image), + cat_("/proc/mounts") =~ m,(/dev/\S+)\s+(/mnt/cdrom|/tmp/image), and ($cdrom, my $mountpoint) = ($1, $2); return unless $cdrom; ejectCdrom($cdrom, $mountpoint); @@ -779,14 +779,14 @@ sub killCardServices() { } sub unlockCdrom() { - my $cdrom = cat_("/proc/mounts") =~ m!(/(?:dev|tmp)/\S+)\s+(?:/mnt/cdrom|/tmp/image)! && $1 or return; + my $cdrom = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+(?:/mnt/cdrom|/tmp/image)! && $1 or return; eval { ioctl(detect_devices::tryOpen($cdrom), c::CDROM_LOCKDOOR(), 0) }; } sub ejectCdrom { my ($o_cdrom, $o_mountpoint) = @_; getFile("XXX"); #- close still opened filehandle - my $cdrom = $o_cdrom || cat_("/proc/mounts") =~ m!(/(?:dev|tmp)/\S+)\s+(/mnt/cdrom|/tmp/image)! && $1 or return; + my $cdrom = $o_cdrom || cat_("/proc/mounts") =~ m!(/dev/\S+)\s+(/mnt/cdrom|/tmp/image)! && $1 or return; $o_mountpoint ||= $2 || '/tmp/image'; #- umount BEFORE opening the cdrom device otherwise the umount will |