Attachment 306802 Details for Bug 444973 – A patch which will hopefully fix the issue.

[patch] A patch which will hopefully fix the issue.

mkinitrd-5.1.19.6-nfs-options.patch (text/plain), 2.88 KB, created by Peter Jones on 2008-05-27 17:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2008-05-27 17:20:02 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/nash/nash.c b/nash/nash.c
>index 3c123ab..a5a9f13 100644
>--- a/nash/nash.c
>+++ b/nash/nash.c
>@@ -322,7 +322,7 @@ mountCommand(char * cmd, char * end)
>     char * fsType = NULL;
>     char * device, *spec;
>     char * mntPoint;
>-    char * options = NULL;
>+    char * nfs_opts = NULL;
>     int rc = 0;
>     int flags = MS_MGC_VAL;
>     char * newOpts;
>@@ -343,7 +343,7 @@ mountCommand(char * cmd, char * end)
>             flags = MS_MOVE;
>             fsType = "none";
>         } else if (!strcmp(spec, "-o")) {
>-            cmd = getArg(cmd, end, &options);
>+            cmd = getArg(cmd, end, &nfs_opts);
>             if (!cmd) {
>                 eprintf("mount: -o requires arguments\n");
>                 return 1;
>@@ -388,7 +388,7 @@ mountCommand(char * cmd, char * end)
>                 } else
>                     fsType = mnt->mnt_type;
> 
>-                options = mnt->mnt_opts;
>+                nfs_opts = mnt->mnt_opts;
>                 break;
>             }
>         } while(1);
>@@ -407,11 +407,12 @@ mountCommand(char * cmd, char * end)
>     }
> 
>     /* need to deal with options */
>-    if (options) {
>+    if (nfs_opts) {
>         char * end;
>-        char * start = options;
>+        char * start = nfs_opts;
>+        char *mount_opts = NULL;
> 
>-        newOpts = alloca(strlen(options) + 1);
>+        newOpts = alloca(strlen(nfs_opts) + 1);
>         *newOpts = '\0';
> 
>         while (*start) {
>@@ -466,7 +467,7 @@ mountCommand(char * cmd, char * end)
>             start = end;
>         }
> 
>-        options = newOpts;
>+        nfs_opts = newOpts;
>     }
> 
>     if (!strncmp(fsType, "nfs", 3)) {
>@@ -482,9 +483,9 @@ mountCommand(char * cmd, char * end)
> 
>     if (_nash_context->testing) {
>         printf("mount %s%s%s-t '%s' '%s' '%s' (%s%s%s%s%s%s%s)\n",
>-                options ? "-o '" : "",
>-                options ? options : "",
>-                options ? "\' " : "",
>+                nfs_opts ? "-o '" : "",
>+                nfs_opts ? nfs_opts : "",
>+                nfs_opts ? "\' " : "",
>                 fsType, device, mntPoint,
>                 (flags & MS_RDONLY) ? "ro " : "",
>                 (flags & MS_NOSUID) ? "nosuid " : "",
>@@ -496,14 +497,13 @@ mountCommand(char * cmd, char * end)
>             );
>     } else {
>         if (!strncmp(fsType, "nfs", 3)) {
>-            char * foo = NULL;
>-            if (nfsmount(device, mntPoint, &flags, &foo, &options, 0)) {
>+            if (nfsmount(device, mntPoint, &flags, &nfs_opts, &mount_opts, 0)) {
>                 eprintf("nfsmount: error mounting %s on %s as %s: %m\n",
>                         device, mntPoint, fsType);
>                 return 1;
>             }
>         }
>-        if (mount(device, mntPoint, fsType, flags, options) < 0) {
>+        if (mount(device, mntPoint, fsType, flags, mount_opts) < 0) {
>             eprintf("mount: error mounting %s on %s as %s: %m\n",
>                     device, mntPoint, fsType);
>             rc = 1;

Actions: View | Diff

Attachments on bug 444973: 306802 | 307544 | 307545