Commit Graph

285 Commits

Author SHA1 Message Date
Stéphane Graber
16bc569bc3
Fix syntax error in japanese manpage
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-19 23:03:43 +02:00
KATOH Yasufumi
a4dbc45fc7 doc: Update Japanese lxc.container.conf(5) for lxc.rootfs conventions
Update for commit f1c26f2

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-19 18:09:06 +02:00
KATOH Yasufumi
e053b31ef0 doc: Update Japanese lxc.container.conf(5) for guidance of lxc.mount.entry
Update for commit 6191f4f

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-19 18:09:02 +02:00
Serge Hallyn
6191f4f421 lxc.container.conf(5): update guidance for lxc.mount.entry mount target
For years it has been best practice to use a relative path as
the mount target.  But the manpage hasn't reflect that.  Fix it.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Dwight Engen <dwight.engen@oracle.com>
2014-05-16 14:26:52 -04:00
Serge Hallyn
f1c26f2cbd lxc.container.conf: document the type: lxc.rootfs conventions
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Dwight Engen <dwight.engen@oracle.com>
2014-05-16 09:58:22 -04:00
KATOH Yasufumi
58291e3a43 doc: Fix Japanese lxc.container.conf(5)
commit aafea1f was incomplete.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-08 10:53:08 -05:00
KATOH Yasufumi
aafea1f750 doc: Update lxc.container.conf(5) for improving lxc.mount.auto
Update for commit 0769b82

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-05-06 16:52:22 -05:00
KATOH Yasufumi
cf5f31286e doc: Update Japanese lxc.container.conf(5) for mounting /sys/fs/cgroup rw
Update for commit b46f055

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-05-06 16:52:21 -05:00
Christian Seiler
0769b82a42 lxc.mount.auto: improve defaults for cgroup and cgroup-full
If the user specifies cgroup or cgroup-full without a specifier (:ro,
:rw or :mixed), this changes the behavior. Previously, these were
simple aliases for the :mixed variants; now they depend on whether the
container also has CAP_SYS_ADMIN; if it does they resolve to the :rw
variants, if it doesn't to the :mixed variants (as before).

If a container has CAP_SYS_ADMIN privileges, any filesystem can be
remounted read-write from within, so initially mounting the cgroup
filesystems partially read-only as a default creates a false sense of
security. It is better to default to full read-write mounts to show the
administrator what keeping CAP_SYS_ADMIN entails.

If an administrator really wants both CAP_SYS_ADMIN and the :mixed
variant of cgroup or cgroup-full automatic mounts, they can still
specify that explicitly; this commit just changes the default without
specifier.

Signed-off-by: Christian Seiler <christian@iwakd.de>
Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-05-06 10:20:10 -05:00
Christian Seiler
b46f055358 cgfs: don't mount /sys/fs/cgroup readonly
Ubuntu containers have had trouble with automatic cgroup mounting that
was not read-write (i.e. lxc.mount.auto = cgroup{,-full}:{ro,mixed}) in
containers without CAP_SYS_ADMIN. Ubuntu's mountall program reads
/lib/init/fstab, which contains an entry for /sys/fs/cgroup. Since
there is no ro option specified for that filesystem, mountall will try
to remount it readwrite if it is already mounted. Without
CAP_SYS_ADMIN, that fails and mountall will interrupt boot and wait for
user input on whether to proceed anyway or to manually fix it,
effectively hanging container bootup.

This patch makes sure that /sys/fs/cgroup is always a readwrite tmpfs,
but that the actual cgroup hierarchy paths (/sys/fs/cgroup/$subsystem)
are readonly if :ro or :mixed is used. This still has the desired
effect within the container (no cgroup escalation possible and programs
get errors if they try to do so anyway), while keeping Ubuntu
containers happy.

Signed-off-by: Christian Seiler <christian@iwakd.de>
Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-05-06 10:20:08 -05:00
KATOH Yasufumi
4724cf84f9 doc: Update Japanese lxc-ls(1) for the new -g/--group argument
Update for commit 0f02786

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-02 13:04:23 -04:00
KATOH Yasufumi
a5ab279643 doc: Update Japanese lxc-create(1) for 'none' bdev type
Update for commit 50040b5

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-02 11:14:27 -04:00
KATOH Yasufumi
63e6a3de81 doc: Update Japanese lxc-clone(1) for fixing typo
Update for commit 0e98b3bd31

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-02 11:14:24 -04:00
Stéphane Graber
0ceb65ff25 lxc-ls: Typo in manpage
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-02 11:13:08 -04:00
Stéphane Graber
0f027869da lxc-ls: Update lxc.group handling
This introduces a new -g/--group argument to filter containers based on
their groups.

This supports the rather obvious: --group blah
Which will only list containers that are in group blah.

It may also be passed multiple times: --group blah --group bleh
Which will list containers that are in either (or both) blah or bleh.

And it also takes: --group blah,bleh --group doh
Which will list containers that are either in BOTH blah and bleh or in doh.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Michael H. Warfield <mhw@WittsEnd.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-05-02 11:12:21 -04:00
Serge Hallyn
50040b5e46 lxc-create: make 'none' bdev type work again
This should address https://github.com/lxc/lxc/issues/199

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-05-01 13:54:16 -04:00
KATOH Yasufumi
dc421f3aac Convert punctuation marks in Japanese man pages
This only converts punctuation marks from FULLWIDTH COMMA/FULL STOP to
IDEOGRAPHIC COMMA/FULL STOP in Japanese man pages. The contents of man
pages do not change at all.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-04-28 12:29:04 -05:00
Serge Hallyn
0e98b3bd31 lxc-clone man page: fix typos
In the body of the manpage, replace a few errant 'fssize's with the
more appropriate word.

Reported-by: MegaBrutal <megabrutal@megabrutal.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-04-28 08:42:24 -05:00
KATOH Yasufumi
bb8eca54d6 doc: Update Japanese lxc-stop(1) to describe about exit value
Update for commit 13bc2fd237

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-04-08 10:13:57 -04:00
Serge Hallyn
13bc2fd237 lxc_*.c: don't exit with -1
In this patch I tried to stick with each file's coding style, however I
think we should probably change that.  Every main() should always not
return and only exit;  they should always return EXIT_SUCCESS or EXIT_FAILURE
with the only exceptions being cases where we are returning a child's
exit status (lxc_execute, lxc_attach, lxc_init).

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-04-07 17:19:14 -04:00
KATOH Yasufumi
c43e979d66 Update Japanese lxc-create(1) for 'best' option
Update for commit a526a632e0

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-21 15:00:22 -04:00
Serge Hallyn
a526a632e0 lxc-create manpage: specify -B best option
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-21 10:25:20 -04:00
KATOH Yasufumi
800648d24a doc: Update Japanese lxc-autostart(1) for -A option
update for commit e582991fd0

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-11 10:26:25 -04:00
KATOH Yasufumi
9111aa7932 doc: Update Japanese lxc-autostart(1) for -a and -g options
update for commit e447a8a706

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-11 10:26:22 -04:00
Stéphane Graber
1efaeac9ae
Fix broken XML in previous commit
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-10 10:34:56 -04:00
KATOH Yasufumi
465532c424 doc: Update Japanese lxc-ls(1)
update for commit 860490af5d

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-10 10:29:25 -04:00
KATOH Yasufumi
b5dd93f70c doc: Update Japanese lxc-create(1)
update for commit d3de16bb56

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-03-10 10:29:16 -04:00
Stéphane Graber
d3de16bb56 lxc-create: Require --template be passed
It's often been reported that the behavior of lxc-create without -t is a
bit confusing. This change makes lxc-create require the --template
option and introduces a new "none" special value which when set will
fallback to the old template-less behavior.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-03-07 17:18:51 -05:00
Stéphane Graber
860490af5d lxc-ls: Update help message to include fields
Instead of maintaining hardcoded lists, point everyone to --help and
have the current list of valid and default fields printed there.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-03-07 17:18:47 -05:00
Stéphane Graber
e582991fd0 lxc-autostart: Add a new --ignore-auto/-A flag
When passed, this flag will cause lxc-autostart to ignore the value of
lxc.start.auto.

This then allows things like: lxc-autostart -s -a -A

Which will select all containers regardless of groups (-a), regardless
of whether they are actually marked as auto-started (-A) and will shut
them down (-s).

Update our init scripts to use the new feature.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-03-07 17:18:44 -05:00
Stéphane Graber
e447a8a706 lxc-autostart: Document -a and -g
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-03-07 17:18:29 -05:00
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