Attachment 654286 Details for Bug 881733 – ad-hoc patch to ipnetns.c

ad-hoc patch to ipnetns.c

file_881733.txt (text/plain), 1.48 KB, created by Etsuji Nakai on 2012-11-29 13:28:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etsuji Nakai

Created: 2012-11-29 13:28:02 UTC

Size: 1.48 KB

patch

obsolete

># diff -uNr ipnetns.c.orig ipnetns.c
>--- ipnetns.c.orig	2012-11-29 18:05:19.304832997 +0900
>+++ ipnetns.c	2012-11-29 21:34:49.529259555 +0900
>@@ -123,7 +123,7 @@
> 	 */
> 	const char *name, *cmd;
> 	char net_path[MAXPATHLEN];
>-	int netns;
>+	int netns, retry;
> 
> 	if (argc < 1) {
> 		fprintf(stderr, "No netns name specified\n");
>@@ -153,14 +153,28 @@
> 		return -1;
> 	}
> 	/* Mount a version of /sys that describes the network namespace */
>-	if (umount2("/sys", MNT_DETACH) < 0) {
>-		fprintf(stderr, "umount of /sys failed: %s\n", strerror(errno));
>-		return -1;
>-	}
>-	if (mount(name, "/sys", "sysfs", 0, NULL) < 0) {
>-		fprintf(stderr, "mount of /sys failed: %s\n",strerror(errno));
>-		return -1;
>-	}
>+        retry = 5;
>+        while (--retry > 0) {
>+                if (umount2("/sys", MNT_DETACH) >= 0) {
>+                        break;
>+                }
>+                sleep(1);
>+        }
>+        if (retry == 0) {
>+                fprintf(stderr, "umount of /sys failed: %s\n", strerror(errno));
>+                return -1;
>+        }
>+        retry = 5;
>+        while (--retry > 0) {
>+                if (mount(name, "/sys", "sysfs", 0, NULL) >= 0) {
>+                        break;
>+                }
>+                sleep(1);
>+        }
>+        if (retry == 0) {
>+                fprintf(stderr, "mount of /sys failed: %s\n",strerror(errno));
>+                return -1;
>+        }
> 
> 	/* Setup bind mounts for config files in /etc */
> 	bind_etc(name);

Actions: View

Attachments on bug 881733: 654286 | 654745