Re: [lxc-devel] [PATCH] Parse: add error info when parse config failed
ping.
Hi Serge or Stéphane,
What do you think about this patch?
Spell error happens in our config file(many times for me :( ), and
this error info will really save user's time to figure out the
problem.
On 2013/9/16 10:04, Qiang Huang wrote:
> When callback of one config line fail, we'd better give the exactly
> info to help users locate the misconfig.
>
> Signed-off-by: Qiang Huang
> ---
> src/lxc/parse.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/lxc/parse.c b/src/lxc/parse.c
> index 26cbbdd..dca808d 100644
> --- a/src/lxc/parse.c
> +++ b/src/lxc/parse.c
> @@ -98,8 +98,10 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb
> callback, void *data)
>
> while (getline(&line, &len, f) != -1) {
> err = callback(line, data);
> - if (err)
> + if (err) {
> + ERROR("Failed to parse config: %s", line);
> break;
> + }
> }
>
> if (line)
>
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] lxc-start fails on android
Quoting riya khanna (riyakhanna1...@gmail.com): > Hi, > > I am trying to run a busybox based container on android. However, lxc-start > fails with the following msgs. Any idea what could be wrong here? Thanks > for your time and help! > > lxc-start 1378915396.741 WARN lxc_start - inherited fd 8 > > lxc-start 1378915396.744 WARN lxc_start - inherited fd 9 > > lxc-start 1378915396.746 INFO lxc_apparmor - apparmor_load - > apparmor is disabled > lxc-start 1378916093.262 DEBUGlxc_console - using '/dev/tty' as > console > lxc-start 1378916093.263 DEBUGlxc_start - sigchild handler set > lxc-start 1378916093.264 INFO lxc_start - 'busybox' is > initialized > lxc-start 1378916093.273 DEBUGlxc_start - Not dropping > cap_sys_boot or watching utmp > > > lxc-start 1378916093.275 INFO lxc_conf - opened > /data/lxc/busybox/rootfs.hold as fd 15 > > > lxc-start 1378916093.291 INFO lxc_conf - 'busybox' hostname has > been setup > lxc-start 1378916093.294 INFO lxc_conf - looking at .37 37 0:1 / > / rw,relatime shared:1 - rootfs rootfs rw > . > lxc-start 1378916093.294 INFO lxc_conf - now p is . /. > > lxc-start 1378916093.298 ERRORlxc_conf - Invalid argument - > Failed to rbind mount / to /data/usr/local/lib/lxc/ro Don't know why you got EINVAL here, but this is where it really fails. > lxc-start 1378916093.301 ERRORlxc_conf - Failed to chroot into > slave / > lxc-start 1378916093.301 ERRORlxc_conf - failed to setup rootfs > for 'busybox' > lxc-start 1378916093.304 ERRORlxc_start - failed to setup the > container > lxc-start 1378916093.305 ERRORlxc_sync - invalid sequence number > 1. expected 2 > lxc-start 1378916093.307 ERRORlxc_start - failed to spawn > 'busybox' > -- > LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! > 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint > 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes > Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. > http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk > ___ > Lxc-devel mailing list > Lxc-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/lxc-devel -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk ___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH] return the result of the lxcapi_want_close_all_fds call to the caller
Quoting S.Çağlar Onur (cag...@10ur.org):
> Signed-off-by: S.Çağlar Onur
Acked-by: Serge E. Hallyn
> ---
> src/lxc/lxccontainer.c | 7 ---
> src/lxc/lxccontainer.h | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index 727c680..5c49b8b 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -456,16 +456,17 @@ static void lxcapi_want_daemonize(struct lxc_container
> *c)
> container_mem_unlock(c);
> }
>
> -static void lxcapi_want_close_all_fds(struct lxc_container *c)
> +static bool lxcapi_want_close_all_fds(struct lxc_container *c)
> {
> if (!c || !c->lxc_conf)
> - return;
> + return false;
> if (container_mem_lock(c)) {
> ERROR("Error getting mem lock");
> - return;
> + return false;
> }
> c->lxc_conf->close_all_fds = 1;
> container_mem_unlock(c);
> + return true;
> }
>
> static bool lxcapi_wait(struct lxc_container *c, const char *state, int
> timeout)
> diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
> index 8b6c6ef..225fb39 100644
> --- a/src/lxc/lxccontainer.h
> +++ b/src/lxc/lxccontainer.h
> @@ -68,7 +68,7 @@ struct lxc_container {
> bool (*startl)(struct lxc_container *c, int useinit, ...);
> bool (*stop)(struct lxc_container *c);
> void (*want_daemonize)(struct lxc_container *c);
> - void (*want_close_all_fds)(struct lxc_container *c);
> + bool (*want_close_all_fds)(struct lxc_container *c);
> // Return current config file name. The result is strdup()d, so free
> the result.
> char *(*config_file_name)(struct lxc_container *c);
> // for wait, timeout == -1 means wait forever, timeout == 0 means don't
> wait.
> --
> 1.8.1.2
>
>
> --
> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
> http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
> ___
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
[lxc-devel] [lxc/lxc] 49badb: return the result of the lxcapi_want_close_all_fds...
Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 49badbbef602f1b8add1ea55d7cf0e1563bfe0db https://github.com/lxc/lxc/commit/49badbbef602f1b8add1ea55d7cf0e1563bfe0db Author: S.Çağlar Onur Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M src/lxc/lxccontainer.c M src/lxc/lxccontainer.h Log Message: --- return the result of the lxcapi_want_close_all_fds call to the caller Signed-off-by: S.Çağlar Onur Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [RFC] rootfs pinning
Quoting Rob Landley (r...@landley.net):
> On 09/12/2013 01:27:07 PM, Christian Seiler wrote:
> > Hi there,
> >
> > just a quick question: currently, rootfs is pinned with a .hold file
> > in
> > the parent directory (which btw. does not help against file systems
> > that
> > are already mounted on the host but directly in the rootfs directory).
> > The problem with the .hold file is that it doesn't make the directory
> > necessarily pretty; I tend to mount all rootfs to /srv/lxc/$container
> > (config remaining in /var/lib/lxc), and then when doing a ls
> > /srv/lxc, I
> > see tons of .hold files. (I'm not even sure that they are removed
> > after
> > container termination - but even if they are, the default state of a
> > typical system tends to be that at least some containers are
> > running...)
> >
> > Couldn't we just open $rootfs/lxc.hold for writing, keep the fd (as
> > current pinfd) and then unlink (!) the file directly? According to
> > POSIX
> > semantics, the file is then still open and the pinning should work
> > (now
> > also for the above case), but there are no files lying around anymore.
> > (Note: I didn't test that, it could well be that that doesn't work.)
> >
> > Thoughts?
>
> Why doesn't keeping a file open to the directory itself work? (I'm
> assuming it doesn't, I'm wondering why.)
Tried it under tmpfs, and open("/mnt", O_RDWR) with tmpfs mounted
at /mnt does not work, gives EISDIR. O_RDONLY does work, but that
doesn't prevent mount -o remount,ro.
Drat, that would've been nice.
-serge
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
[lxc-devel] [lxc/lxc] 48e2f3: When callback of one config line fail, we'd better...
Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 48e2f384e09a51255e677f2f3f1c5c9b92742660 https://github.com/lxc/lxc/commit/48e2f384e09a51255e677f2f3f1c5c9b92742660 Author: Qiang Huang Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M src/lxc/parse.c Log Message: --- When callback of one config line fail, we'd better give the exactly info to help users locate the misconfig. Signed-off-by: Qiang Huang Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH RFC 0/1] refactor AppArmor into LSM backend, add SELinux support
Quoting Dwight Engen (dwight.en...@oracle.com): > On Sat, 21 Sep 2013 00:32:42 -0500 > Serge Hallyn wrote: > > > Quoting Dwight Engen (dwight.en...@oracle.com): > > > This change proposes to add support to LXC for additional LSMs > > > (Linux Security Module), namely SELinux. It does so by turning the > > > existing > > > > Thanks, Dwight! > > > > I do some bikeshed arguing below, but I will do a closer review next > > week, hopefully monday. > > Okay, thanks! > > > > AppArmor calls into generic lsm_* calls, which are then handled by > > > one of three LSM drivers: AppArmor, SELinux, or a nop driver. > > > Adding a SMACK driver should be fairly simple. The nop driver is > > > used when LXC has compiled in support for AppArmor or SELinux but > > > neither is enabled in the run time environment. > > > > > > One minor point of discussion should be whether to keep the > > > aa_profile configuration item and have a separate selinux_context > > > item, or to use the approach taken in this patch which is to > > > genericize the name to lsm_label. Using a single lsm_label implies > > > that the policies will never be used together, which I believe is > > > likely a safe assumption. > > > > You might be right on this, but there are two counter-arguments, and > > I'm not sure where I stand. The first counter argument is that I > > might want to share a config or config excerpt (i.e. lxc.include) > > between several hosts, some of which are apparmor-enabled and some > > selinux-enabled. Or even migrate or stop-and-move a container between > > such hosts. Ignoring the labeling issue :) that would not be possible > > with this setup. Secondly, there *is* on-going work, with a non-zero > > chance of inclusion, to enable stacking LSMs in the kernel. I doubt > > that even i that case you'd want to use both to confine the > > container, but one never knows. You might want to use apparmor to > > confine the container as seen from the container, while specifying > > that the contaienr should start as unconfined_t so that the selinux > > policy in the container can work. (Far-fetched, I agree.) > > I wasn't sure which way to go on this either. I think you have good > points there so I'm fine with having the config items be separate :) > Another thing to point out is that I think its nice if lxc always knows > how to parse those config items, even if it wasn't compiled with > AppArmor or SELinux, that way if you are given a config from a machine > that did have it, it won't barf parsing it and cloning would pass it > through. If you disagree, I can put them back behind #ifdefs. Definately agree, especially with the cloning argument. > I had seen that there was some thought to stacking LSMs, so I guess we > shouldn't rule that out in case it does happen. > > > Thirdly, we would at least want lxc.aa_profile to be handled as a > > valid legacy case so that existing containers don't break > > > > > A larger issue is the semantics around when lxc changes > > > profile/context. Currently, the AppArmor backend uses > > > aa_change_profile() which changes the profile immediately. No > > > analog exists in SELinux, so the SELinux backend uses > > > setexeccon_raw() which only takes effect upon exec(2). We could > > > change the AppArmor backend to use aa_change_onexec() to give them > > > similar semantics, but this would possibly break callers relying on > > > the "immediate > > > > Note that I wanted to use the aa_change_onexec() originally, but did > > not only because it was broken at the time. > > Ahh, I saw that but I didn't know why you opted to use the non-exec > version. > > > > change" behavior (in particular users of the new attach API calling > > > a function). I don't know how widespread this reliance might be, > > > but I don't think that model is supportable in SELinux. The current > > > patch does not try to resolve the difference, I guess one option is > > > to just leave it that way. Definitely looking for some guidance > > > here. > > > > In general "now" vs "on-exec" seem to be the two main ways to change > > contexts so I think it's fine to support both. > > You mean that its fine that the two backends behave a bit differently? > We can't support "now" in SELinux as far as I can see. Yeah I think those are the two main ways that an LSM can work so supporting both is fine. ISTR there *was* some grudgingly-added, unfortunate support for "now" in SELinux, but I don't recall the interface and was against it anyway, so let's not go there. I'll wait for your next patch, then test it here heavily. thanks, -serge -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubad
Re: [lxc-devel] [PATCH] Parse: add error info when parse config failed
Quoting Qiang Huang (h.huangqi...@huawei.com):
> ping.
>
> Hi Serge or Stéphane,
>
> What do you think about this patch?
> Spell error happens in our config file(many times for me :( ), and
> this error info will really save user's time to figure out the
> problem.
>
> On 2013/9/16 10:04, Qiang Huang wrote:
> > When callback of one config line fail, we'd better give the exactly
> > info to help users locate the misconfig.
> >
> > Signed-off-by: Qiang Huang
I don't remember seeing this before. Looks good, thanks.
Acked-by: Serge E. Hallyn
> > ---
> > src/lxc/parse.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/lxc/parse.c b/src/lxc/parse.c
> > index 26cbbdd..dca808d 100644
> > --- a/src/lxc/parse.c
> > +++ b/src/lxc/parse.c
> > @@ -98,8 +98,10 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb
> > callback, void *data)
> >
> > while (getline(&line, &len, f) != -1) {
> > err = callback(line, data);
> > - if (err)
> > + if (err) {
> > + ERROR("Failed to parse config: %s", line);
> > break;
> > + }
> > }
> >
> > if (line)
> >
>
>
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH RFC 1/1] refactor AppArmor into LSM backend, add SELinux support
Quoting Dwight Engen (dwight.en...@oracle.com): > diff --git a/src/lxc/lsm/nop.c b/src/lxc/lsm/nop.c > new file mode 100644 > index 000..61dfbe9 > --- /dev/null > +++ b/src/lxc/lsm/nop.c > @@ -0,0 +1,45 @@ > +/* > + * lxc: linux Container library > + * > + * Copyright © 2013 Oracle. > + * > + * Authors: > + * Dwight Engen > + * > + * This library is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2, as > + * published by the Free Software Foundation. > + * Just a note, again this needs to be LGPL. (Didn't see any problems on my first read-through) -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk ___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [RFC] rootfs pinning
On 09/23/2013 11:19:17 AM, Serge Hallyn wrote:
> Quoting Rob Landley (r...@landley.net):
> > On 09/12/2013 01:27:07 PM, Christian Seiler wrote:
> > > Hi there,
> > >
> > > just a quick question: currently, rootfs is pinned with a .hold
> file
> > > in
> > > the parent directory (which btw. does not help against file
> systems
> > > that
> > > are already mounted on the host but directly in the rootfs
> directory).
> > > The problem with the .hold file is that it doesn't make the
> directory
> > > necessarily pretty; I tend to mount all rootfs to
> /srv/lxc/$container
> > > (config remaining in /var/lib/lxc), and then when doing a ls
> > > /srv/lxc, I
> > > see tons of .hold files. (I'm not even sure that they are removed
> > > after
> > > container termination - but even if they are, the default state
> of a
> > > typical system tends to be that at least some containers are
> > > running...)
> > >
> > > Couldn't we just open $rootfs/lxc.hold for writing, keep the fd
> (as
> > > current pinfd) and then unlink (!) the file directly? According to
> > > POSIX
> > > semantics, the file is then still open and the pinning should work
> > > (now
> > > also for the above case), but there are no files lying around
> anymore.
> > > (Note: I didn't test that, it could well be that that doesn't
> work.)
> > >
> > > Thoughts?
> >
> > Why doesn't keeping a file open to the directory itself work? (I'm
> > assuming it doesn't, I'm wondering why.)
>
> Tried it under tmpfs, and open("/mnt", O_RDWR) with tmpfs mounted
> at /mnt does not work, gives EISDIR. O_RDONLY does work, but that
> doesn't prevent mount -o remount,ro.
The filesystem hitting an error (including one from the block device)
can make most filesystems remount themselves read only, forcibly even
with active writers. The permissions to do so from userspace should be
roughly analogous to calling shutdown or "kill -1"? (I'm wondering what
lxc's interest is in preventing the container-local root from doing
something container-local dangerous?)
> Drat, that would've been nice.
Judging by the rest of the thread, the reason for half the weird
complexity people do with filesystems is apparently "NFS is horrible".
(I need to go bang on 9p some more and try to help replace that.)
> -serge
Rob
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH 3/4] doc: Make everything use the @docdtd@ variable
Quoting Stéphane Graber (stgra...@ubuntu.com): > Signed-off-by: Stéphane Graber I assume it doesn't really matter, but note that configure.ac doesn't have the "V4.5//EN" as the entries you are replacing do. Acked-by: Serge E. Hallyn > --- > doc/ja/legacy/lxc-ls.sgml.in | 2 +- > doc/ja/lxc-attach.sgml.in | 2 +- > doc/ja/lxc-cgroup.sgml.in | 2 +- > doc/ja/lxc-checkconfig.sgml.in | 2 +- > doc/ja/lxc-checkpoint.sgml.in | 2 +- > doc/ja/lxc-clone.sgml.in | 2 +- > doc/ja/lxc-console.sgml.in | 2 +- > doc/ja/lxc-create.sgml.in | 2 +- > doc/ja/lxc-destroy.sgml.in | 2 +- > doc/ja/lxc-device.sgml.in | 2 +- > doc/ja/lxc-execute.sgml.in | 2 +- > doc/ja/lxc-freeze.sgml.in | 2 +- > doc/ja/lxc-info.sgml.in| 2 +- > doc/ja/lxc-kill.sgml.in| 2 +- > doc/ja/lxc-ls.sgml.in | 2 +- > doc/ja/lxc-monitor.sgml.in | 2 +- > doc/ja/lxc-netstat.sgml.in | 2 +- > doc/ja/lxc-ps.sgml.in | 2 +- > doc/ja/lxc-restart.sgml.in | 2 +- > doc/ja/lxc-shutdown.sgml.in| 2 +- > doc/ja/lxc-start-ephemeral.sgml.in | 2 +- > doc/ja/lxc-start.sgml.in | 2 +- > doc/ja/lxc-stop.sgml.in| 2 +- > doc/ja/lxc-top.sgml.in | 2 +- > doc/ja/lxc-unfreeze.sgml.in| 2 +- > doc/ja/lxc-unshare.sgml.in | 2 +- > doc/ja/lxc-version.sgml.in | 2 +- > doc/ja/lxc-wait.sgml.in| 2 +- > doc/ja/lxc.conf.sgml.in| 2 +- > doc/ja/lxc.sgml.in | 2 +- > 30 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/doc/ja/legacy/lxc-ls.sgml.in b/doc/ja/legacy/lxc-ls.sgml.in > index 980b7ba..077d4fa 100644 > --- a/doc/ja/legacy/lxc-ls.sgml.in > +++ b/doc/ja/legacy/lxc-ls.sgml.in > @@ -27,7 +27,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > ]> > diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in > index 9fa14ca..0d75d3e 100644 > --- a/doc/ja/lxc-attach.sgml.in > +++ b/doc/ja/lxc-attach.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-cgroup.sgml.in b/doc/ja/lxc-cgroup.sgml.in > index 45cf6e6..8e77d20 100644 > --- a/doc/ja/lxc-cgroup.sgml.in > +++ b/doc/ja/lxc-cgroup.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-checkconfig.sgml.in b/doc/ja/lxc-checkconfig.sgml.in > index 4e0ac44..04a0453 100644 > --- a/doc/ja/lxc-checkconfig.sgml.in > +++ b/doc/ja/lxc-checkconfig.sgml.in > @@ -24,7 +24,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > ]> > diff --git a/doc/ja/lxc-checkpoint.sgml.in b/doc/ja/lxc-checkpoint.sgml.in > index 7308120..bcb761d 100644 > --- a/doc/ja/lxc-checkpoint.sgml.in > +++ b/doc/ja/lxc-checkpoint.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-clone.sgml.in b/doc/ja/lxc-clone.sgml.in > index 7c64287..54cef22 100644 > --- a/doc/ja/lxc-clone.sgml.in > +++ b/doc/ja/lxc-clone.sgml.in > @@ -27,7 +27,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-console.sgml.in b/doc/ja/lxc-console.sgml.in > index 4d69aff..5fc2728 100644 > --- a/doc/ja/lxc-console.sgml.in > +++ b/doc/ja/lxc-console.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-create.sgml.in b/doc/ja/lxc-create.sgml.in > index 9713abd..275203a 100644 > --- a/doc/ja/lxc-create.sgml.in > +++ b/doc/ja/lxc-create.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-destroy.sgml.in b/doc/ja/lxc-destroy.sgml.in > index e82bcfb..a962708 100644 > --- a/doc/ja/lxc-destroy.sgml.in > +++ b/doc/ja/lxc-destroy.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > > diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-device.sgml.in > index d46582e..10d0ecb 100644 > --- a/doc/ja/lxc-device.sgml.in > +++ b/doc/ja/lxc-device.sgml.in > @@ -24,7 +24,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > + > > ]> > diff --git a/doc/ja/lxc-execute.sgml.in b/doc/ja/lxc-execute.sgml.in > index ec016fb..50826d8 100644 > --- a/doc/ja/lxc-execute.sgml.in > +++ b/doc/ja/lxc-execute.sgml.in > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > --> > > - "http://www.oasis-open.org/docbook/xml/4.5/docbo
Re: [lxc-devel] [PATCH 4/4] doc: Fixed my first name
Quoting Stéphane Graber (stgra...@ubuntu.com): > Signed-off-by: Stéphane Graber Nacked-by: Serge E. Hallyn Just kidding :) Acked-by: Serge E. Hallyn > --- > doc/ja/lxc-checkconfig.sgml.in | 2 +- > doc/ja/lxc-device.sgml.in | 2 +- > doc/ja/lxc-info.sgml.in| 2 +- > doc/ja/lxc-netstat.sgml.in | 2 +- > doc/ja/lxc-start-ephemeral.sgml.in | 3 +-- > doc/ja/lxc-version.sgml.in | 2 +- > 6 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/doc/ja/lxc-checkconfig.sgml.in b/doc/ja/lxc-checkconfig.sgml.in > index 04a0453..e53ea25 100644 > --- a/doc/ja/lxc-checkconfig.sgml.in > +++ b/doc/ja/lxc-checkconfig.sgml.in > @@ -3,7 +3,7 @@ > (C) Copyright Canonical Ltd. 2013 > > Authors: > -St辿phane Graber > +Stéphane Graber > > This library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-device.sgml.in > index 10d0ecb..d982370 100644 > --- a/doc/ja/lxc-device.sgml.in > +++ b/doc/ja/lxc-device.sgml.in > @@ -3,7 +3,7 @@ > (C) Copyright Canonical Ltd. 2013 > > Authors: > -St辿phane Graber > +Stéphane Graber > > This library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > diff --git a/doc/ja/lxc-info.sgml.in b/doc/ja/lxc-info.sgml.in > index 61aecbb..bd2b559 100644 > --- a/doc/ja/lxc-info.sgml.in > +++ b/doc/ja/lxc-info.sgml.in > @@ -3,7 +3,7 @@ > (C) Copyright Canonical Ltd. 2013 > > Authors: > -St辿phane Graber > +Stéphane Graber > > This library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > diff --git a/doc/ja/lxc-netstat.sgml.in b/doc/ja/lxc-netstat.sgml.in > index 5779444..ea542e8 100644 > --- a/doc/ja/lxc-netstat.sgml.in > +++ b/doc/ja/lxc-netstat.sgml.in > @@ -3,7 +3,7 @@ > (C) Copyright Canonical Ltd. 2013 > > Authors: > -St辿phane Graber > +Stéphane Graber > > This library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > diff --git a/doc/ja/lxc-start-ephemeral.sgml.in > b/doc/ja/lxc-start-ephemeral.sgml.in > index c8dc82d..6491a21 100644 > --- a/doc/ja/lxc-start-ephemeral.sgml.in > +++ b/doc/ja/lxc-start-ephemeral.sgml.in > @@ -1,10 +1,9 @@ > - > 1.8.3.2 > > > -- > LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! > 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint > 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes > Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. > http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk > ___ > Lxc-devel mailing list > Lxc-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/lxc-devel -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk ___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH 1/4] Consistently use for the API
Quoting Stéphane Graber (stgra...@ubuntu.com):
> The API header was included in a variety of ways before, standardize
> those to "include " as this will always work both in
> tree and on a system with the headers installed.
>
> Signed-off-by: Stéphane Graber
Acked-by: Serge E. Hallyn
> ---
> src/lxc/bdev.h | 2 +-
> src/lxc/console.c | 2 +-
> src/lxc/lxc_clone.c| 2 +-
> src/lxc/lxc_config.c | 2 +-
> src/lxc/lxc_console.c | 2 +-
> src/lxc/lxc_create.c | 2 +-
> src/lxc/lxc_destroy.c | 2 +-
> src/lxc/lxc_snapshot.c | 2 +-
> src/lxc/lxc_start.c| 2 +-
> src/lxc/lxccontainer.c | 2 +-
> src/tests/cgpath.c | 2 +-
> src/tests/clonetest.c | 2 +-
> src/tests/concurrent.c | 2 +-
> src/tests/console.c| 2 +-
> src/tests/containertests.c | 2 +-
> src/tests/createtest.c | 2 +-
> src/tests/destroytest.c| 2 +-
> src/tests/get_item.c | 2 +-
> src/tests/getkeys.c| 2 +-
> src/tests/lxcpath.c| 2 +-
> src/tests/saveconfig.c | 2 +-
> src/tests/shutdowntest.c | 2 +-
> src/tests/snapshot.c | 2 +-
> src/tests/startone.c | 2 +-
> 24 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
> index f9d9a0c..a603d9e 100644
> --- a/src/lxc/bdev.h
> +++ b/src/lxc/bdev.h
> @@ -29,7 +29,7 @@
> */
>
> #include "config.h"
> -#include "lxccontainer.h"
> +#include
>
> struct bdev;
>
> diff --git a/src/lxc/console.c b/src/lxc/console.c
> index 78be403..d854dbb 100644
> --- a/src/lxc/console.c
> +++ b/src/lxc/console.c
> @@ -31,7 +31,7 @@
> #include
> #include
>
> -#include "lxccontainer.h"
> +#include
> #include "log.h"
> #include "conf.h"
> #include "config.h"
> diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
> index 8b5c6e9..e0be9da 100644
> --- a/src/lxc/lxc_clone.c
> +++ b/src/lxc/lxc_clone.c
> @@ -32,7 +32,7 @@
> #include "lxc.h"
> #include "conf.h"
> #include "state.h"
> -#include "lxccontainer.h"
> +#include
>
> lxc_log_define(lxc_clone, lxc);
>
> diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
> index b3f2ed8..c90be7d 100644
> --- a/src/lxc/lxc_config.c
> +++ b/src/lxc/lxc_config.c
> @@ -20,7 +20,7 @@
>
> #include
> #include "config.h"
> -#include "lxccontainer.h"
> +#include
>
> struct lxc_config_items {
> char *name;
> diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
> index 28ad772..ea1e999 100644
> --- a/src/lxc/lxc_console.c
> +++ b/src/lxc/lxc_console.c
> @@ -38,7 +38,7 @@
> #include
> #include
>
> -#include "../lxc/lxccontainer.h"
> +#include
> #include "error.h"
> #include "lxc.h"
> #include "log.h"
> diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
> index 4f205e8..f577e30 100644
> --- a/src/lxc/lxc_create.c
> +++ b/src/lxc/lxc_create.c
> @@ -17,7 +17,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> -#include "../lxc/lxccontainer.h"
> +#include
>
> #include
> #include
> diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
> index 0724eb8..a1f73ca 100644
> --- a/src/lxc/lxc_destroy.c
> +++ b/src/lxc/lxc_destroy.c
> @@ -17,7 +17,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> -#include "../lxc/lxccontainer.h"
> +#include
>
> #include
> #include
> diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
> index 0177f5d..c21563f 100644
> --- a/src/lxc/lxc_snapshot.c
> +++ b/src/lxc/lxc_snapshot.c
> @@ -17,7 +17,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> -#include "../lxc/lxccontainer.h"
> +#include
>
> #include
> #include
> diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
> index a30a9f6..a894513 100644
> --- a/src/lxc/lxc_start.c
> +++ b/src/lxc/lxc_start.c
> @@ -43,7 +43,7 @@
> #include "log.h"
> #include "caps.h"
> #include "lxc.h"
> -#include "lxccontainer.h"
> +#include
> #include "conf.h"
> #include "cgroup.h"
> #include "utils.h"
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index 727c680..44f68cc 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -31,7 +31,7 @@
> #include "config.h"
> #include "lxc.h"
> #include "state.h"
> -#include "lxccontainer.h"
> +#include
> #include "conf.h"
> #include "confile.h"
> #include "console.h"
> diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
> index f9aaced..26a79c3 100644
> --- a/src/tests/cgpath.c
> +++ b/src/tests/cgpath.c
> @@ -16,7 +16,7 @@
> * with this program; if not, write to the Free Software Foundation, Inc.,
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
> -#include "../lxc/lxccontainer.h"
> +#include
>
> #include
> #include
> diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
> index da3ce75..b04ab3c 100644
> --- a/src/tests/clonetest.c
> +++ b/src/tests/clonetest.c
> @@ -16,7 +16,7 @@
> * with this program; if not, write to the Free
Re: [lxc-devel] [PATCH 2/4] Add some missing comments to configure.ac
Quoting Stéphane Graber (stgra...@ubuntu.com):
> Signed-off-by: Stéphane Graber
Acked-by: Serge E. Hallyn
> ---
> configure.ac | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index 6c74dcd..a523583 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -52,6 +52,7 @@ esac
> AC_MSG_RESULT([$with_distro])
> AM_CONDITIONAL([HAVE_DEBIAN], [test x"$with_distro" = "xdebian" -o
> x"$with_distro" = "xubuntu"])
>
> +# Detect the newuidmap tool (required for userns)
> AC_CHECK_PROG([NEWUIDMAP], [newuidmap], [newuidmap])
> AM_CONDITIONAL([HAVE_NEWUIDMAP], [test -n "$NEWUIDMAP"])
>
> @@ -242,12 +243,14 @@ AC_ARG_WITH([global-conf],
> [global lxc configuration file]
> )], [], [with_global_conf=['${sysconfdir}/lxc/lxc.conf']])
>
> +# The path of the userns network configuration file
> AC_ARG_WITH([usernic-conf],
> [AC_HELP_STRING(
> [--with-usernic-conf],
> [user network interface configuration file]
> )], [], [with_usernic_conf=['${sysconfdir}/lxc/lxc-usernet']])
>
> +# The path of the runtime usernic database
> AC_ARG_WITH([usernic-db],
> [AC_HELP_STRING(
> [--with-usernic-db],
> @@ -260,6 +263,7 @@ AC_ARG_WITH([rootfs-path],
> [--with-rootfs-path=dir],
> [lxc rootfs mount point]
> )], [], [with_rootfs_path=['${libdir}/lxc/rootfs']])
> +
> # cgroup pattern specification
> AC_ARG_WITH([cgroup-pattern],
> [AC_HELP_STRING(
> --
> 1.8.3.2
>
>
> --
> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
> http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
> ___
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
___
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
[lxc-devel] [lxc/lxc] 948955: Consistently use for the API
Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 948955a2d6f8e4e28bceada9666c5831de4a6bb8 https://github.com/lxc/lxc/commit/948955a2d6f8e4e28bceada9666c5831de4a6bb8 Author: Stéphane Graber Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M src/lxc/bdev.h M src/lxc/console.c M src/lxc/lxc_clone.c M src/lxc/lxc_config.c M src/lxc/lxc_console.c M src/lxc/lxc_create.c M src/lxc/lxc_destroy.c M src/lxc/lxc_snapshot.c M src/lxc/lxc_start.c M src/lxc/lxccontainer.c M src/tests/cgpath.c M src/tests/clonetest.c M src/tests/concurrent.c M src/tests/console.c M src/tests/containertests.c M src/tests/createtest.c M src/tests/destroytest.c M src/tests/get_item.c M src/tests/getkeys.c M src/tests/lxcpath.c M src/tests/saveconfig.c M src/tests/shutdowntest.c M src/tests/snapshot.c M src/tests/startone.c Log Message: --- Consistently use for the API The API header was included in a variety of ways before, standardize those to "include " as this will always work both in tree and on a system with the headers installed. Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn Commit: c75c30ec73b7d57042b1c4b6330daadff3c7e33f https://github.com/lxc/lxc/commit/c75c30ec73b7d57042b1c4b6330daadff3c7e33f Author: Stéphane Graber Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M configure.ac Log Message: --- Add some missing comments to configure.ac Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn Commit: faefa7f8584a7d1567df2e6f1f9240a28a6466ab https://github.com/lxc/lxc/commit/faefa7f8584a7d1567df2e6f1f9240a28a6466ab Author: Stéphane Graber Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M doc/ja/legacy/lxc-ls.sgml.in M doc/ja/lxc-attach.sgml.in M doc/ja/lxc-cgroup.sgml.in M doc/ja/lxc-checkconfig.sgml.in M doc/ja/lxc-checkpoint.sgml.in M doc/ja/lxc-clone.sgml.in M doc/ja/lxc-console.sgml.in M doc/ja/lxc-create.sgml.in M doc/ja/lxc-destroy.sgml.in M doc/ja/lxc-device.sgml.in M doc/ja/lxc-execute.sgml.in M doc/ja/lxc-freeze.sgml.in M doc/ja/lxc-info.sgml.in M doc/ja/lxc-kill.sgml.in M doc/ja/lxc-ls.sgml.in M doc/ja/lxc-monitor.sgml.in M doc/ja/lxc-netstat.sgml.in M doc/ja/lxc-ps.sgml.in M doc/ja/lxc-restart.sgml.in M doc/ja/lxc-shutdown.sgml.in M doc/ja/lxc-start-ephemeral.sgml.in M doc/ja/lxc-start.sgml.in M doc/ja/lxc-stop.sgml.in M doc/ja/lxc-top.sgml.in M doc/ja/lxc-unfreeze.sgml.in M doc/ja/lxc-unshare.sgml.in M doc/ja/lxc-version.sgml.in M doc/ja/lxc-wait.sgml.in M doc/ja/lxc.conf.sgml.in M doc/ja/lxc.sgml.in Log Message: --- doc: Make everything use the @docdtd@ variable Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn Commit: 9d0cda4f22f76d693e2ceef0f77f2ba24227433c https://github.com/lxc/lxc/commit/9d0cda4f22f76d693e2ceef0f77f2ba24227433c Author: Stéphane Graber Date: 2013-09-23 (Mon, 23 Sep 2013) Changed paths: M doc/ja/lxc-checkconfig.sgml.in M doc/ja/lxc-device.sgml.in M doc/ja/lxc-info.sgml.in M doc/ja/lxc-netstat.sgml.in M doc/ja/lxc-start-ephemeral.sgml.in M doc/ja/lxc-version.sgml.in Log Message: --- doc: Fixed my first name Signed-off-by: Stéphane Graber Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn Compare: https://github.com/lxc/lxc/compare/48e2f384e09a...9d0cda4f22f7 -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk___ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
Re: [lxc-devel] [PATCH 3/4] doc: Make everything use the @docdtd@ variable
On Mon, Sep 23, 2013 at 03:22:47PM -0500, Serge Hallyn wrote: > Quoting Stéphane Graber (stgra...@ubuntu.com): > > Signed-off-by: Stéphane Graber > > I assume it doesn't really matter, but note that configure.ac doesn't > have the "V4.5//EN" as the entries you are replacing do. > > Acked-by: Serge E. Hallyn Yeah, I doubt it matters. I did a test build and compare the result and it seemed close enough for me not to dig any deeper. > > > --- > > doc/ja/legacy/lxc-ls.sgml.in | 2 +- > > doc/ja/lxc-attach.sgml.in | 2 +- > > doc/ja/lxc-cgroup.sgml.in | 2 +- > > doc/ja/lxc-checkconfig.sgml.in | 2 +- > > doc/ja/lxc-checkpoint.sgml.in | 2 +- > > doc/ja/lxc-clone.sgml.in | 2 +- > > doc/ja/lxc-console.sgml.in | 2 +- > > doc/ja/lxc-create.sgml.in | 2 +- > > doc/ja/lxc-destroy.sgml.in | 2 +- > > doc/ja/lxc-device.sgml.in | 2 +- > > doc/ja/lxc-execute.sgml.in | 2 +- > > doc/ja/lxc-freeze.sgml.in | 2 +- > > doc/ja/lxc-info.sgml.in| 2 +- > > doc/ja/lxc-kill.sgml.in| 2 +- > > doc/ja/lxc-ls.sgml.in | 2 +- > > doc/ja/lxc-monitor.sgml.in | 2 +- > > doc/ja/lxc-netstat.sgml.in | 2 +- > > doc/ja/lxc-ps.sgml.in | 2 +- > > doc/ja/lxc-restart.sgml.in | 2 +- > > doc/ja/lxc-shutdown.sgml.in| 2 +- > > doc/ja/lxc-start-ephemeral.sgml.in | 2 +- > > doc/ja/lxc-start.sgml.in | 2 +- > > doc/ja/lxc-stop.sgml.in| 2 +- > > doc/ja/lxc-top.sgml.in | 2 +- > > doc/ja/lxc-unfreeze.sgml.in| 2 +- > > doc/ja/lxc-unshare.sgml.in | 2 +- > > doc/ja/lxc-version.sgml.in | 2 +- > > doc/ja/lxc-wait.sgml.in| 2 +- > > doc/ja/lxc.conf.sgml.in| 2 +- > > doc/ja/lxc.sgml.in | 2 +- > > 30 files changed, 30 insertions(+), 30 deletions(-) > > > > diff --git a/doc/ja/legacy/lxc-ls.sgml.in b/doc/ja/legacy/lxc-ls.sgml.in > > index 980b7ba..077d4fa 100644 > > --- a/doc/ja/legacy/lxc-ls.sgml.in > > +++ b/doc/ja/legacy/lxc-ls.sgml.in > > @@ -27,7 +27,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > ]> > > diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in > > index 9fa14ca..0d75d3e 100644 > > --- a/doc/ja/lxc-attach.sgml.in > > +++ b/doc/ja/lxc-attach.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-cgroup.sgml.in b/doc/ja/lxc-cgroup.sgml.in > > index 45cf6e6..8e77d20 100644 > > --- a/doc/ja/lxc-cgroup.sgml.in > > +++ b/doc/ja/lxc-cgroup.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-checkconfig.sgml.in b/doc/ja/lxc-checkconfig.sgml.in > > index 4e0ac44..04a0453 100644 > > --- a/doc/ja/lxc-checkconfig.sgml.in > > +++ b/doc/ja/lxc-checkconfig.sgml.in > > @@ -24,7 +24,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > ]> > > diff --git a/doc/ja/lxc-checkpoint.sgml.in b/doc/ja/lxc-checkpoint.sgml.in > > index 7308120..bcb761d 100644 > > --- a/doc/ja/lxc-checkpoint.sgml.in > > +++ b/doc/ja/lxc-checkpoint.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-clone.sgml.in b/doc/ja/lxc-clone.sgml.in > > index 7c64287..54cef22 100644 > > --- a/doc/ja/lxc-clone.sgml.in > > +++ b/doc/ja/lxc-clone.sgml.in > > @@ -27,7 +27,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-console.sgml.in b/doc/ja/lxc-console.sgml.in > > index 4d69aff..5fc2728 100644 > > --- a/doc/ja/lxc-console.sgml.in > > +++ b/doc/ja/lxc-console.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-create.sgml.in b/doc/ja/lxc-create.sgml.in > > index 9713abd..275203a 100644 > > --- a/doc/ja/lxc-create.sgml.in > > +++ b/doc/ja/lxc-create.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-destroy.sgml.in b/doc/ja/lxc-destroy.sgml.in > > index e82bcfb..a962708 100644 > > --- a/doc/ja/lxc-destroy.sgml.in > > +++ b/doc/ja/lxc-destroy.sgml.in > > @@ -26,7 +26,7 @@ by KATOH Yasufumi > > > > --> > > > > - > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ > > + > > > > > > > diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-dev
