From 665d9ad8aa8b8a71198ef8b6cae00e94b9244391 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 12 Aug 1999 12:05:22 +0000
Subject: no_comment

---
 perl-install/devices.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 704b3d40d..9346b687e 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -38,9 +38,11 @@ sub size($) {
 sub make($) {
     local $_ = my $file = $_[0];
     my ($type, $major, $minor);
+    my ($prefix);
 
-    unless (s,^/(dev|tmp)/,,) {
-	$file = -e "/dev/$file" ? "/dev/$file" : "/tmp/$file";
+    unless (s,^(.*)/(dev|tmp)/,,) {
+	$prefix = $1;
+	$file = -e "$prefix/dev/$file" ? "$prefix/dev/$file" : "$prefix/tmp/$file";
     }
 
     -e $file and return $file; # assume nobody takes fun at creating files named as device
@@ -94,7 +96,7 @@ sub make($) {
 		   "scd0"    => [ c::S_IFBLK(), 11, 0 ],
 		   "scd1"    => [ c::S_IFBLK(), 11, 1 ],
 		   "sjcd"    => [ c::S_IFBLK(), 18, 0 ],
-	       }}{$_} or die "unknown device $type" };
+	       }}{$_} or die "unknown device $_" };
     }
     
     # make a directory for this inode if needed.
-- 
cgit v1.2.1