Attachment 5050 Details for Bug 9051 – switch to regular mount for NFS (untested)

[patch] switch to regular mount for NFS (untested)

0001-switch-to-using-regular-mount-for-nfs.patch (text/plain), 1.11 KB, created by Thierry Vignaud on 2014-03-14 08:12:06 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2014-03-14 08:12:06 CET

Size: 1.11 KB

patch

obsolete

>From f15071b05ce5577a96e834f167049b70f49e8dbb Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Fri, 14 Mar 2014 08:02:58 +0100
>Subject: [PATCH 1/3] switch to using regular mount for nfs
>
>---
> mdk-stage1/mount.c | 4 ----
> mdk-stage1/mount.h | 4 ----
> 2 files changed, 8 deletions(-)
>
>diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
>index d1b290a..316c64c 100644
>--- a/mdk-stage1/mount.c
>+++ b/mdk-stage1/mount.c
>@@ -256,10 +256,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 e0d9249..dc8d674 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);
> 
>-- 
>1.8.5.4
>

From f15071b05ce5577a96e834f167049b70f49e8dbb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 14 Mar 2014 08:02:58 +0100
Subject: [PATCH 1/3] switch to using regular mount for nfs

---
 mdk-stage1/mount.c | 4 ----
 mdk-stage1/mount.h | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index d1b290a..316c64c 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -256,10 +256,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 e0d9249..dc8d674 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);
 
-- 
1.8.5.4

Actions: View | Diff

Attachments on bug 9051: 5050 | 5051