Linux Container Development
 help / color / mirror / Atom feed
From: Nathan Lynch <ntl-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
To: "Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: Linux Containers <containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org>
Subject: Re: [PATCH user-cr] define MNT_DETACH in older userspace
Date: Mon, 22 Feb 2010 11:57:57 -0600	[thread overview]
Message-ID: <1266861478.3760.2.camel@localhost.localdomain> (raw)
In-Reply-To: <20100222174755.GA8329-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

Thanks, I had already put together a local fix which adds a compat
header -- please use this instead of duplicating the work across files?

From 9d8b8774d4c471f04203b589f49ffe59e1d0cf39 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
Date: Mon, 22 Feb 2010 11:50:46 -0600
Subject: [PATCH 1/1] user-cr: add compat.h; define MNT_DETACH

"nsexec: remount proc and devpts" introduced usage of the MNT_DETACH
umount2 flag, which is not defined even in some relatively recent
glibc headers (e.g. Fedora 10/glibc 2.9-3).  Add a compat.h header
where we can add fixups like this for older build environments.

Signed-off-by: Nathan Lynch <ntl-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
---
 include/compat.h |    7 +++++++
 nsexec.c         |    1 +
 restart.c        |    1 +
 3 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 include/compat.h

diff --git a/include/compat.h b/include/compat.h
new file mode 100644
index 0000000..0d5ade4
--- /dev/null
+++ b/include/compat.h
@@ -0,0 +1,7 @@
+#ifndef USER_CR_COMPAT_H
+
+#ifndef MNT_DETACH
+#define MNT_DETACH 2
+#endif
+
+#endif /* USER_CR_COMPAT_H */
diff --git a/nsexec.c b/nsexec.c
index 7a0294c..1cf9c97 100644
--- a/nsexec.c
+++ b/nsexec.c
@@ -20,6 +20,7 @@
 #include "clone.h"
 #include "eclone.h"
 #include "genstack.h"
+#include "compat.h"
 
 extern pid_t getpgid(pid_t pid);
 extern pid_t getsid(pid_t pid);
diff --git a/restart.c b/restart.c
index 166a499..f5d23bb 100644
--- a/restart.c
+++ b/restart.c
@@ -38,6 +38,7 @@
 
 #include "eclone.h"
 #include "genstack.h"
+#include "compat.h"
 
 static char usage_str[] =
 "usage: restart [opts]\n"
-- 
1.6.0.6

  parent reply	other threads:[~2010-02-22 17:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-22 17:47 [PATCH user-cr] define MNT_DETACH in older userspace Serge E. Hallyn
     [not found] ` <20100222174755.GA8329-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-02-22 17:57   ` Nathan Lynch [this message]
     [not found]     ` <1266861478.3760.2.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2010-02-22 18:03       ` Serge E. Hallyn
2010-02-22 18:07       ` Nathan Lynch
     [not found]         ` <1266862049.12720.1.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2010-02-22 22:51           ` Oren Laadan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266861478.3760.2.camel@localhost.localdomain \
    --to=ntl-e+axbwqsrlaavxtiumwx3w@public.gmane.org \
    --cc=containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org \
    --cc=serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox