From dddfb90059117e6dde52c09e79ba0c8672942b53 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 17 Apr 2000 15:42:29 +0000
Subject: no_comment

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 36972a11b..485f24660 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -164,7 +164,14 @@ sub formatMount_all {
       foreach sort { isLoopback($a) ? 1 : -1 } grep { $_->{mntpoint} } @$fstab;
 
     #- ensure the link is there
-    loopback::carryRootCreateSymlink($_, $prefix) foreach @$fstab;    
+    loopback::carryRootCreateSymlink($_, $prefix) foreach @$fstab;
+
+    #- for fun :)
+    #- that way, when install exits via ctrl-c, it gives hand to partition
+    eval {
+	my ($type, $major, $minor) = devices::entry(fsedit::get_root($fstab)->{device});
+	output "/proc/sys/kernel/real-root-dev", makedev($major, $minor);
+    };
 }
 
 sub mount($$$;$) {
@@ -388,7 +395,7 @@ sub write_fstab($;$$) {
 sub merge_fstabs {
     my ($fstab, $manualFstab) = @_;
     my %l; $l{$_->{device}} = $_ foreach @$manualFstab;
-    add2hash_($_, $l{$_->{device}} || next) foreach @$fstab;
+    %$_ = (%$_, %{$l{$_->{device}} || next}) foreach @$fstab;
 }
 
 #sub check_mount_all_fstab($;$) {
-- 
cgit v1.2.1