summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-13 04:50:22 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-13 04:50:22 +0000
commitcd01fbb85a4c7f75340ecbe3c501c011e3b10493 (patch)
tree744b6c86e5ed8f59a7c1426502b0f78c8e44d234 /perl-install/standalone
parentdf691ad0522e7851e689bd3287c6cf98960ec551 (diff)
downloaddrakx-backup-do-not-use-cd01fbb85a4c7f75340ecbe3c501c011e3b10493.tar
drakx-backup-do-not-use-cd01fbb85a4c7f75340ecbe3c501c011e3b10493.tar.gz
drakx-backup-do-not-use-cd01fbb85a4c7f75340ecbe3c501c011e3b10493.tar.bz2
drakx-backup-do-not-use-cd01fbb85a4c7f75340ecbe3c501c011e3b10493.tar.xz
drakx-backup-do-not-use-cd01fbb85a4c7f75340ecbe3c501c011e3b10493.zip
(device_name_to_entry) in non devfs case, $e->{device} always equals
to $name, move this test in devfs case
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakupdate_fstab5
1 files changed, 2 insertions, 3 deletions
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;
}