MAAS

Merge lp:~kevkirkpatrick/maas/maas-lp1281173 into lp:~maas-committers/maas/trunk

  1. maas-lp1281173
  2. Merge into trunk
Proposed by Kevin Kirkpatrick
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 1960
Proposed branch: lp:~kevkirkpatrick/maas/maas-lp1281173
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
docs/configure.rst (+2/-2)
To merge this branch: bzr merge lp:~kevkirkpatrick/maas/maas-lp1281173
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+206783@code.launchpad.net

Commit message

Fix path of the preseed files in the documentation.

Description of the change

Correct the default location of the preseeds (LP: #1281173)

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good, thanks for doing this!

review: Approve
Revision history for this message
Raphaël Badin (rvb) wrote :

This is now deployed, see http://maas.ubuntu.com/docs/configure.html.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/configure.rst'
2--- docs/configure.rst 2014-02-11 05:21:58 +0000
3+++ docs/configure.rst 2014-02-17 18:35:40 +0000
4@@ -121,8 +121,8 @@
5 pressed file to work around some issue.
6 There are actually two preseed files, stored here::
7
8- /usr/share/maas/preseeds/generic
9- /usr/share/maas/preseeds/preseed-master
10+ /etc/maas/preseeds/generic
11+ /etc/maas/preseeds/preseed-master
12
13 The generic file actually references the preseed-master file, and is
14 used to set conditional parameters based on the type of series and