Otto

Merge lp:~vila/otto/doc-fixes into lp:otto

  1. doc-fixes
  2. Merge into trunk
Proposed by Vincent Ladeuil
Status: Merged
Merged at revision: 260
Proposed branch: lp:~vila/otto/doc-fixes
Merge into: lp:otto
Diff against target: 40 lines (+10/-2)
2 files modified
doc/README (+8/-0)
ottolib/commands.py (+2/-2)
To merge this branch: bzr merge lp:~vila/otto/doc-fixes
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+196591@code.launchpad.net

Commit message

Doc fixes.

Description of the change

A couple of simple doc fixes that were taking dust on my drive.

The lxc chmod bits has already striked thrice in ci so it seems more people will encounter it in the future.

To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/README'
2--- doc/README 2013-10-30 09:26:00 +0000
3+++ doc/README 2013-11-25 16:37:05 +0000
4@@ -23,6 +23,14 @@
5 $ sudo apt-get install bzr --no-install-recommends
6 $ sudo apt-get install python3-lxc aufs-tools
7
8+ On 14.04 (Trusty Tahr):
9+
10+ $ sudo chmod 755 /var/cache/lxc
11+ $ sudo chmod 755 /var/lib/lxc
12+
13+ See https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1244635 for
14+ rationale.
15+
16 * If you don't want to call otto with the full path of the checkout, you
17 can put it into $PATH with (running in your otto checkout/branch):
18 $ mkdir ~/bin
19
20=== modified file 'ottolib/commands.py'
21--- ottolib/commands.py 2013-05-30 08:50:31 +0000
22+++ ottolib/commands.py 2013-11-25 16:37:05 +0000
23@@ -70,7 +70,7 @@
24 "image will be extracted and used as rootfs")
25 pcreate.add_argument("--local-config",
26 default=None,
27- help="Use a local configuration file. This one will be reuse until you specify --no-local-config")
28+ help="Use a local configuration file. This one will be reused until you specify --no-local-config")
29 pcreate.add_argument('-D', '--force-disconnect', action='store_true',
30 default=False,
31 help="Forcibly shutdown lightdm even if a session "
32@@ -106,7 +106,7 @@
33 help="Restore a previous the run state from an archive")
34 pstart.add_argument("--local-config",
35 default=None,
36- help="Use a local configuration file. This one will be reuse until you specify --no-local-config")
37+ help="Use a local configuration file. This one will be reused until you specify --no-local-config")
38 pstart.add_argument("--no-local-config", action='store_true',
39 default=None,
40 help="Remove previously used local configuration file.")

Subscribers

People subscribed via source and target branches