From 7f5508ce30ddb89239136c5d81c4b3e8368351c0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 25 Nov 2004 12:14:11 +0000
Subject: 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)

---
 perl-install/fs.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/fs.pm')

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 2839489ba..a8c479989 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -129,7 +129,7 @@ sub merge_fstabs {
 sub analyze_wild_device_name {
     my ($dev) = @_;
 
-    if ($dev =~ m!^/(tmp|u?dev)/(.*)!) {
+    if ($dev =~ m!^/u?dev/(.*)!) {
 	'dev', $dev;
     } elsif ($dev !~ m!^/! && -e "$::prefix/dev/$dev") {
 	'dev', "/dev/$dev";
@@ -161,7 +161,7 @@ sub subpart_from_wild_device_name {
 	    }
 
 	    my $symlink = readlink("$::prefix$dev");
-	    $dev =~ s!/(tmp|u?dev)/!!;
+	    $dev =~ s!/u?dev/!!;
 
 	    if ($symlink && $symlink =~ m|^[^/]+$|) {
 		$part{device_alias} = $dev;
-- 
cgit v1.2.1