use fsedit::is_same_hd in drakupdate_fstab and revert previous change in fs::subpart_from_wild_device_name (do not fill both devfs_device and device fields)

1 files changed, 2 insertions, 2 deletions

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 6093b005e..35399d3be 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -152,8 +152,8 @@ sub subpart_from_wild_device_name {
 	    }
 	    $dev =~ s!/(tmp|dev)/!!;
 
-	    $part{device} = $dev;
-	    $part{devfs_device} = $dev if $dev =~ m!/(disc|part\d+)$!;
+	    my $is_devfs = $dev =~ m!/(disc|part\d+)$!;
+	    $part{$is_devfs ? 'devfs_device' : 'device'} = $dev;
 	    return \%part;
 	} else {
 	    log::l("part_from_wild_device_name: unknown device $dev");