Revision 5e2e29b9

b/docs/advanced.rst
31 31
------------
32 32

  
33 33
 * For Linux systems, having grub installed in the partition is fragile and
34
   things can go wrong when resizing the partitions, especially when shrinking.
34
   things can go wrong if you shrink the partition.
35 35
 * More complicated partition schemes are not supported.
36 36

  
37 37
diskdump image format (recommended)
......
44 44

  
45 45
 * Swap partitions are supported
46 46
 * The system may use multiple partitions:
47
    * dedicated partitions for /boot, /home etc in Linux
48
    * system and boot partition in Windows
47
    * Dedicated partitions for /boot, /home etc. in Linux
48
    * Separate system and boot partition in Windows
49 49
 * There are no restrictions on starting sectors of partitions
50 50

  
51 51
Although diskdump is a lot more flexible than the older formats, there are
52 52
still some rules to follow:
53 53

  
54
 * All devices in fstab should be specified by persistent names (UUID or LABEL)
55
 * LVMs are not supported
56
 * For Linux disks only ext{2,3,4} file systems are supported
57
 * For FreeBSD disks only UFS file systems are supported
58
 * For FreeBSD only GUID Partition Tables (GPT) are supported
54
 * For Linux:
55
   * All block devices in */etc/fstab* should be specified using persistent
56
     names (UUID or LABEL)
57
   * LVM partitions are not supported
58
   * Only ext{2,3,4} file systems are supported
59
 * For FreeBSD:
60
   * GUID Partition Tables (GPT) should be used
61
   * Only UFS2 file systems are supported
62
   * Labels should be omitted in */etc/fstab* entries
63
 * For {Open,Net}BSD:
64
   * Only FFS file systems should be used
59 65

  
60 66
Progress Monitoring Interface
61 67
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
......
67 73
program. In this section we will describe the format and the fields of the
68 74
progress messages.
69 75

  
70
The progress messages are json strings with standardized fields. All messages
76
The progress messages are JSON strings with standardized fields. All messages
71 77
have a **type** field whose value is a string and a **timestamp** field whose
72 78
value is a floating point number referring to a time encoded as the number of
73 79
seconds elapsed since the epoch. The rest of the field depend on the specific
......
138 144
This messages are produced to display a warning. The actual warning message
139 145
itself is present in the *messages* field:
140 146

  
141
``{"subtype": "warning", "type": "image-helper", "messages": [" No swap partition defined"], "timestamp": 1379075807.71704}``
147
``{"subtype": "warning", "type": "image-helper", "messages": ["No swap partition defined"], "timestamp": 1379075807.71704}``
142 148

  
143 149
error
144 150
-----
b/docs/index.rst
19 19

  
20 20
snf-image also supports Image customization via hooks. Hooks allow for:
21 21

  
22
 * changing the password of root or arbitrary users
23
 * injecting files at arbitrary locations inside the filesystem, e.g., SSH keys
22
 * Changing the password of root or arbitrary users
23
 * Injecting files into the file system, e.g., SSH keys
24 24
 * setting a custom hostname
25 25
 * re-creating SSH host keys to ensure the image uses unique keys
26 26

  
27 27
snf-image is being used in large scale production environments with Ganeti to
28 28
successfully deploy many major Linux distributions (Debian, Ubuntu/Kubuntu,
29
CentOS, Fedora, OpenSUSE), Windows 2008 R2 & Windows Server 2012, as well as
30
FreeBSD. Support for OpenBSD and NetBSD is also included with exception to
31
extending partitions.
29
CentOS, Fedora, OpenSUSE, Slackware, Arch Linux), Windows Server flavors
30
(2008 R2, 2012, 20012 R2), as well as BSD systems (FreeBSD, OpenBSD, NetBSD).
32 31

  
33 32
The snf-image Ganeti OS Definition is released under
34 33
`GPLv2 <http://www.gnu.org/licenses/gpl-2.0.html>`_.
b/docs/usage.rst
59 59
   [`diskdump <http://cdn.synnefo.org/freebsd-9.2-x86_64.diskdump>`_]
60 60
   [`md5sum <http://cdn.synnefo.org/freebsd-9.2-x86_64.diskdump.md5sum>`_]
61 61
   [`metadata <http://cdn.synnefo.org/freebsd-9.2-x86_64.diskdump.meta>`_]
62
 * OpenBSD 5.4
63
   [`diskdump <http://cdn.synnefo.org/openbsd-5.4-x86_64.diskdump>`_]
64
   [`md5sum <http://cdn.synnefo.org/openbsd-5.4-x86_64.diskdump.md5sum>`_]
65
   [`metadata <http://cdn.synnefo.org/openbsd-5.4-x86_64.diskdump.meta>`_]
66
 * NetBSD 6.1
67
   [`diskdump <http://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump>`_]
68
   [`md5sum <http://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump.md5sum>`_]
69
   [`metadata <http://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump.meta>`_]
62 70

  
63 71
Sample Usage
64 72
^^^^^^^^^^^^

Also available in: Unified diff