From 60cf416ae208f2596d9cb33cf04025f5b25a10e6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 14 Mar 2014 08:02:58 +0100 Subject: switch to using regular mount for nfs --- mdk-stage1/NEWS | 1 + mdk-stage1/mount.c | 4 ---- mdk-stage1/mount.h | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index ef99b30f0..fa469718c 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -2,6 +2,7 @@ o let libblk guess the right fs type rather than manually trying a long list of potential fses o use regular mount tool rather than manual system calls + o use regular mount tool for NFS too (support NFSv4, ...) 2.33 diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c index 858beaf90..4ff1f5ffa 100644 --- a/mdk-stage1/mount.c +++ b/mdk-stage1/mount.c @@ -127,10 +127,6 @@ int my_mount(char *dev, char *location, char *fs, int force_rw) #ifndef DISABLE_NETWORK if (!strcmp(fs, "nfs")) { my_modprobe("nfs", ANY_DRIVER_TYPE, NULL); - log_message("preparing nfsmount for %s", dev); - rc = nfsmount_prepare(dev, &opts); - if (rc != 0) - return rc; } #endif diff --git a/mdk-stage1/mount.h b/mdk-stage1/mount.h index e0d924901..dc8d674c3 100644 --- a/mdk-stage1/mount.h +++ b/mdk-stage1/mount.h @@ -22,10 +22,6 @@ #ifndef _MOUNT_H_ #define _MOUNT_H_ -#ifndef DISABLE_NETWORK -#include "nfsmount.h" -#endif - int my_mount(char *dev, char *location, char *fs, int force_rw); int ensure_dev_exists(const char * dev); -- cgit v1.2.1