From cd01fbb85a4c7f75340ecbe3c501c011e3b10493 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 13 Aug 2004 04:50:22 +0000
Subject: (device_name_to_entry) in non devfs case, $e->{device} always equals
 to $name, move this test in devfs case

---
 perl-install/standalone/drakupdate_fstab | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install/standalone/drakupdate_fstab')

diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 01c21e758..ed2a86cea 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -68,6 +68,8 @@ sub device_name_to_entry {
 	$e->{devfs_device} = $e->{devfs_prefix} . '/part' . $nb;
 	if ($e->{devfs_device} eq $name) {
 	    $e->{prefer_devfs_name} = 1;
+	} else {
+	    $e->{device} = $name;
 	}
     } else {
 	unless ($e = find { $name eq $_->{device} } @l) {
@@ -78,9 +80,6 @@ sub device_name_to_entry {
     }
 
     $e ||= {};
-    unless ($e->{devfs_device} eq $name) {
-	$e->{device} = $name; #- keeping the exact name given (often is the devfs name)
-    }
     $e->{media_type} = 'fd' if $name =~ /fd[01]/;
     $e;
 }
-- 
cgit v1.2.1