Commit Graph

254 Commits

Author SHA1 Message Date
KATOH Yasufumi
95ab9daa02 doc: Update Japanese lxc.container.conf(5)
Update for commit 3a5ec236b7

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-19 10:39:56 -05:00
Dwight Engen
3a5ec236b7 doc: update for commit 69aa6655
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-18 14:21:32 -05:00
KATOH Yasufumi
e8ea311657 doc: Update Japanese lxc-clone(1)
Update for commit f9ae4107f7

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-02-18 09:27:36 -06:00
Stéphane Graber
f9ae4107f7
doc: Fix broken grammar.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-17 23:50:34 -05:00
KATOH Yasufumi
77e229918d Japanese lxc-usernsexec manpage: fix typo
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-14 10:09:42 -05:00
Serge Hallyn
cc69660a57 lxc-usernsexec manpage: fix typo (command name is not lxc-unshare)
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-02-13 22:40:51 -06:00
Stéphane Graber
5693029730
Update rootfs README
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-13 13:52:50 -05:00
KATOH Yasufumi
4473e38b99 doc: Update lxc.container.conf(5)
- Update Japanese man for commit a7c27357b3, seccomp v2
- Fix typo in English man

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-13 10:13:26 -05:00
KATOH Yasufumi
48e49f08c0 doc: Update Japanese man pages for aufs support
Update lxc-clone(1) and lxc-snapshot(1) for commit 1f92162dc0
and improve some translations

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-13 10:13:23 -05:00
Stéphane Graber
e9e0ec9906
Add the seccomp examples to EXTRA_DIST
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-12 23:19:45 -05:00
Serge Hallyn
a7c27357b3 seccomp: extend manpage, and add examples
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-12 19:26:32 -05:00
Stéphane Graber
1f92162dc0 bdev: Add aufs support
This is pretty much copy/paste from overlayfs.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-02-12 16:43:55 -05:00
KATOH Yasufumi
eb7829c1c6 doc: Add the common options section to lxc-create(1)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-06 11:05:33 -05:00
KATOH Yasufumi
b4c66de1b2 doc: Update Japanese lxc.container.conf(5) for lxc.rootfs.options
update for commit a17b1e65fa

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-03 11:46:37 -05:00
KATOH Yasufumi
2035b7d919 doc: Update Japanese lxc-info(1) to remove "RUNNING" of -c option
update for commit 5c4734bcfb

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-02-03 11:46:35 -05:00
Stéphane Graber
a17b1e65fa Implement lxc.rootfs.options
This introduces a new lxc.rootfs.options which lets you pass new
mountflags/mountdata when mounting the root filesystem.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-31 11:47:19 +00:00
Stéphane Graber
5c4734bcfb
doc: lxc-info -c doesn't require RUNNING
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-31 09:16:04 +00:00
KATOH Yasufumi
ef65fe134f doc: fix the SEE ALSO section of Japanese lxc-user-nic(1)
* update for commit e43157b4b2

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-27 09:08:26 +00:00
Dwight Engen
e43157b4b2 doc: fix See Also lxc-usernet.conf -> lxc-usernet
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 13:07:50 -05:00
KATOH Yasufumi
3220ecebfc doc: Add Japanese lxc-config(1)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 11:52:35 -05:00
Stéphane Graber
ff5e275105 doc: Add manpage for lxc-config
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-23 12:51:47 -05:00
KATOH Yasufumi
fb261f53fc doc: Add Japanese lxc.container.conf(5), lxc.system.conf(5) and update lxc.conf(5)
* update for commit 55fc19a104
* fix typo in English lxc.system.conf(5)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.coM>
2014-01-23 10:53:06 -05:00
Stéphane Graber
55fc19a104 doc: Try to clear some confusion about lxc.conf
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-22 22:16:20 -05:00
Stéphane Graber
7f12cae956 Remove lxc-version, lxc-ps and lxc-netstat
lxc-ps and lxc-netstat have an unfortunate tendency to break every so
often, produce mostly unreadable output and should be replaced by a
lxc-attach call in 99% of the cases.

In an effort to cleanup the lxc-* namespace, I think those two should
go, so this patch gets rid of them as well as any reference to them in
our documentation.

I also think that lxc-version should disappear as it's only a one line
shell script printing the version string, so having a whole command just
for that seems to be a bit of a waste.

Instead, this patch introduces a new --version common option which all
binaries will automatically inherit and that'll print LXC_VERSION on
stdout and exit 0.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-22 13:38:46 -05:00
KATOH Yasufumi
755d8d03b1 Add Japanese lxc-usernsexec(1) and fix typo English lxc-usernsexec(1)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-20 10:09:05 -05:00
KATOH Yasufumi
2bec0e1bc9 doc: Remove the description of lxc-kill in Japanese lxc-execute(1)
Update for commit 33ddfc2ade

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-20 10:09:03 -05:00
Stéphane Graber
33ddfc2ade Deprecate lxc-checkpoint, lxc-kill and lxc-restart
Checkpoint/restart isn't currently supported, so let's not carry those
binaries around until we have proper CRIU support in the API.

lxc-kill is redundant with lxc-stop -k and has been known to confuse user.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-18 10:13:50 -05:00
Serge Hallyn
adade80c7e lxc-usernsexec: add a manpage
and fix the help output in the program

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-17 18:47:01 -05:00
KATOH Yasufumi
348cb247db doc: Update Japanese lxc-ls(1) for -f and -F option
Update for commit c5afb6e455

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-17 11:14:27 -05:00
Stéphane Graber
ff6bf8d18f doc: Update no-netns for lxc.network.type = none
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-16 16:28:20 -05:00
Stéphane Graber
c5afb6e455 lxc-ls: Add -f and -F as aliases
Alias -f to --fancy and -F to --fancy-format.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-16 15:45:02 -05:00
KATOH Yasufumi
3dcb8ff3dd doc: Update Japanese man pages
* lxc-unshare(1): Update for commit c1bb25a831 and 13d8bde96f
* lxc.conf(5): Update for commit 04a243f11d

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-16 10:35:26 -05:00
Stéphane Graber
09ec76ceec
Add missing entry to dist target
Apparently this file has gone over 5 years without getting into a dist
tarball!

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-15 19:21:26 -05:00
Seth Robertson
c1bb25a831 Teach lxc_unshare about interfaces, mounts, hostname, daemonize
lxc_unshare now takes one or more '-i interfacename' arguments which
will move the named interfaces into the created container.

lxc_unshare now takes -M argument which will cause the standard mounts
(/proc /dev/shm /dev/mqueue) to be auto-mounted inside container.

lxc_unshare now takes '-H hostname' argument to automatically set
the hostname in the container.

lxc_unshare now takes -D argument to automatically daemonize and detach
from the created container, instead of waiting for the container to exit

Signed-off-by: Seth Robertson <srobertson@appcomsci.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-15 15:42:36 -06:00
Seth Robertson
13d8bde96f lxc_unshare -u argument useful even with USER namespace shared
Signed-off-by: Seth Robertson <srobertson@appcomsci.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-15 15:42:29 -06:00
Serge Hallyn
04a243f11d lxc.conf: note the 'lxc.network.type = none' option
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-15 12:20:50 -05:00
KATOH Yasufumi
fcdb97df5d doc: Update Japanese lxc.conf(5)
Update for commit df2d420507

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-15 10:06:10 -05:00
KATOH Yasufumi
83b4b1dca8 doc: Update lxc.conf(5)
* Update Japanese lxc.conf(5) for commit 508c263ee6
* Remove duplicate line in English lxc.conf(5)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-14 09:50:43 -05:00
Serge Hallyn
508c263ee6 This change introduce mac address templating.
By setting lxc.network.hwaddr to something like fe:xx:xx:xx:xx:xx each
"x" will be replaced by a random value.  If less significant bit of
first byte is "templated", it will be set to 0.

This change introduce also a common randinit() function that could be
used to initialize random generator.

Signed-off-by: gza <lxc@zitta.fr>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-13 10:04:10 -06:00
Dwight Engen
df2d420507 ensure all config items are duplicated on clone/write_config
Since previously I had found a config item that wasn't being propagated
by lxc-clone, I went through all the config items and made sure that:
 a) Each item is documented in lxc.conf
 b) Each item is written out by write_config

The only one that isn't is lxc.include, which by its nature only pulls
in other config item types.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-12 19:25:47 -05:00
KATOH Yasufumi
d7768b9096 doc: Remove unneeded "SEE ALSO" part in lxc-ls(1)
The old version of lxc-ls is the wrapper of ls(1). But now it is
python script, so "see also ls(1)" is not needed.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-09 10:35:07 -05:00
Qiang Huang
6f63931122 lxc-ls.sgml.in: fix the format issue
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-08 09:49:16 -05:00
Stéphane Graber
baeebd0d79
man: Fix comment syntax
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-07 10:26:16 -05:00
KATOH Yasufumi
38d626f8be doc: Update Japanese lxc-stop(1), lxc.conf(5), lxc-start-ephemeral(1)
* nokill option of lxc-stop (commit 84fbfcb434)
* lxc.haltsignal in lxc.conf (commit f0f1d8c076)
* fix sgml (commit d438f5a0ef)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-07 09:22:06 -05:00
Dwight Engen
f0f1d8c076 add lxc.haltsignal for soft shutdown
- use this in the busybox template since busybox's init expects
  to receive SIGUSR1 to halt

- fix lxc.stopsignal to be output by write_config so lxcapi_clone()
  and lxcapi_save_config() will output it

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-06 12:49:44 -05:00
Qiang Huang
d438f5a0ef lxc-start-ephemeral: fix the man page
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-06 10:21:11 -05:00
Dwight Engen
84fbfcb434 rename lxc-stop shutdown argument to nokill
This makes the arguments between lxc-stop and lxc-autostart more
consistent, so that --shutdown doesn't have two different meanings.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-06 10:06:05 -05:00
KATOH Yasufumi
a600d021ad doc: Update man pages to the latest information
* lxc-attach(1): Update to the status of kernel 3.8 or higher
* lxc-create(1), lxc-destroy(1): Now lxc-ls don't have "-l" option, so remove
* lxc(7): update description of lxc-ls and lxc-info to current version
* see-also: fix lxc(1) to lxc(7)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-06 09:51:53 -05:00
KATOH Yasufumi
5fd9f759c1 doc: Update Japanese lxc-autostart(1)
Update for commit a771fe18d2

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-06 09:51:08 -05:00
Dwight Engen
a771fe18d2 change lxc-autostart shutdown to behave like lxc-stop
It is desirable to have a mode where a soft shutdown is requested,
but then do a hard shutdown if after some time period the container
has not shut down. This the default behaviour of lxc-stop, but is
not currently possible with lxc-autostart. This change makes this
the default behaviour when shutdown is specified to lxc-autostart.
This will be very useful for init scripts.

An indefinte wait for soft shutdown (though I'm not sure how that
would be useful) is still possible by passing a timeout of 0.

Change default timeout value to 60 seconds to match lxc-stop

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-02 11:01:19 -06:00