From e82688c8b8f639705356d25c180ffe754c2b2c34 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 1 Jul 1999 18:50:20 +0000
Subject: *** empty log message ***

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 225f5341b..50cdec0fc 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -79,6 +79,8 @@ sub format_part($;$) {
 
     $part->{isFormatted} and return;
 
+    log::l("formatting device $part->{device} (type ", type2name($_->{type}), ")");
+
     if (isExt2($part)) {
 	format_ext2($part->{device}, $bad_blocks);
     } elsif (isDos($part)) {
@@ -102,16 +104,16 @@ sub mount($$$;$) {
 	nfs::mount($dev, $where) or die "nfs mount failed";
     } elsif ($fs eq 'smb') {
 	die "no smb yet...";
-    }
-    $dev = devices::make($dev);
-  
-    my $flag = 0;#c::MS_MGC_VAL();
-    $flag |= c::MS_RDONLY() if $rdonly;
-    my $mount_opt = $fs eq 'vfat' ? "check=relaxed" : "";
-  
-    log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
-    syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die "mount failed: $!";
+    } else {
+	$dev = devices::make($dev) if $fs ne 'proc';
 
+	my $flag = 0;#c::MS_MGC_VAL();
+	$flag |= c::MS_RDONLY() if $rdonly;
+	my $mount_opt = $fs eq 'vfat' ? "check=relaxed" : "";
+  
+	log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
+	syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die "mount failed: $!";
+    }
     local *F;
     open F, ">>/etc/mtab" or return; # fail silently, must be read-only /etc
     print F "$dev $where $fs defaults 0 0\n";
-- 
cgit v1.2.1