From 314859a4872032b07c5d0e57adf3d596049e2fdc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 20 Aug 2001 22:05:05 +0000
Subject: basic nfs handling in drakx

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index a511ce931..3562f3cf1 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -507,11 +507,8 @@ sub mount {
 
     my @fs_modules = qw(vfat hfs romfs ufs reiserfs xfs jfs ext3);
 
-    if ($fs eq 'nfs') {
-	log::l("calling nfs::mount($dev, $where)");
-#	nfs::mount($dev, $where) or die _("nfs mount failed");
-    } elsif ($fs eq 'smbfs') {
-	die "no smb yet...";
+    if (member($fs, 'smb', 'nfs') && $::isStandalone) {
+	system('mount', $dev, $where) == 0 or die _("mount failed");
     } elsif (member($fs, 'ext2', @fs_modules)) {
 	$dev = devices::make($dev) if $fs ne 'proc' && $fs ne 'usbdevfs';
 
@@ -579,7 +576,7 @@ sub mount_part {
 	    } elsif (loopback::carryRootLoopback($part)) {
 		$mntpoint = "/initrd/loopfs";
 	    }
-	    mount(devices::make($dev), $mntpoint, type2fs($part), $rdonly);
+	    mount($dev, $mntpoint, type2fs($part), $rdonly);
 	    rmdir "$mntpoint/lost+found";
 	}
     }
-- 
cgit v1.2.1