[v2 0/2] doc: Explain significance of partition labels.

[v2 0/2] doc: Explain significance of partition labels.

[Leo Famulari]

This fixes some mistakes in my texinfo markup and alters the
configuration templates to (hopefully) make them more instructive.

Leo Famulari (2):
  doc: Explain significance of partition labels.
  doc: Be more explicit in example of file-systems configuration.

 doc/guix.texi                       | 8 ++++++++
 gnu/system/examples/bare-bones.tmpl | 4 ++--
 gnu/system/examples/desktop.tmpl    | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

-- 
2.6.2

[v2 1/2] doc: Explain significance of partition labels.

[Leo Famulari]

* doc/guix.texi (Preparing for Installation): Point out relationship
between partition labels and the file-system configuration.
---
 doc/guix.texi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 06d70ba..152a713 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -16,6 +16,7 @@ Copyright @copyright{} 2013 Nikita Karetnikov@*
 Copyright @copyright{} 2015 Mathieu Lirzin@*
 Copyright @copyright{} 2014 Pierre-Antoine Rault@*
 Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer
+Copyright @copyright{} 2015 Leo Famulari
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -5456,6 +5457,13 @@ reliably refer to them in @code{file-system} declarations (@pxref{File
 Systems}).  This is typically done using the @code{-L} option of
 @command{mkfs.ext4} and related commands.
 
+Be sure that your partition labels match the value of their respective
+@code{device} fields in your @code{file-system} configuration, if your
+@code{file-system} configuration sets the value of @code{title} to
+@code{'label}, as do the example configurations found on the USB
+installation image under @file{/etc/configuration} (@pxref{Using the
+Configuration System}).
+
 @c FIXME: Uncomment this once GRUB fully supports encrypted roots.
 @c A typical command sequence may be:
 @c
-- 
2.6.2

[v2 2/2] doc: Be more explicit in example of file-systems configuration.

[Leo Famulari]

* gnu/system/examples/bare-bones.tmpl (file-systems): Change device
label.
* gnu/system/examples/desktop.tmpl (file-systems): Likewise.
---
 gnu/system/examples/bare-bones.tmpl | 4 ++--
 gnu/system/examples/desktop.tmpl    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl
index dc5cfc8..ad2f1c4 100644
--- a/gnu/system/examples/bare-bones.tmpl
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -10,11 +10,11 @@
   (timezone "Europe/Berlin")
   (locale "en_US.UTF-8")
 
-  ;; Assuming /dev/sdX is the target hard disk, and "root" is
+  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition" is
   ;; the label of the target root file system.
   (bootloader (grub-configuration (device "/dev/sdX")))
   (file-systems (cons (file-system
-                        (device "root")
+                        (device "my-root-partition")
                         (title 'label)
                         (mount-point "/")
                         (type "ext4"))
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index ee660e0..0fb3a70 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -10,11 +10,11 @@
   (timezone "Europe/Paris")
   (locale "en_US.UTF-8")
 
-  ;; Assuming /dev/sdX is the target hard disk, and "root" is
-  ;; the label of the target root file system.
+  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition"
+  ;; is the label of the target root file system.
   (bootloader (grub-configuration (device "/dev/sdX")))
   (file-systems (cons (file-system
-                        (device "root")
+                        (device "my-root-partition")
                         (title 'label)
                         (mount-point "/")
                         (type "ext4"))
-- 
2.6.2

Re: [v2 1/2] doc: Explain significance of partition labels.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * doc/guix.texi (Preparing for Installation): Point out relationship
> between partition labels and the file-system configuration.

OK!

Ludo'.

Re: [v2 2/2] doc: Be more explicit in example of file-systems configuration.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/system/examples/bare-bones.tmpl (file-systems): Change device
> label.
> * gnu/system/examples/desktop.tmpl (file-systems): Likewise.

[...]

> +  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition" is

[...]

> +  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition"

Could you run ‘make guix.pdf’ and check whether these lines need to be
made shorter?  If needed, maybe this could be changed to “my-root”.

Otherwise OK to push!

Thanks,
Ludo’.

Re: [v2 2/2] doc: Be more explicit in example of file-systems configuration.

[Leo Famulari]

On Mon, Dec 21, 2015 at 04:36:55PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > * gnu/system/examples/bare-bones.tmpl (file-systems): Change device
> > label.
> > * gnu/system/examples/desktop.tmpl (file-systems): Likewise.
> 
> [...]
> 
> > +  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition" is
> 
> [...]
> 
> > +  ;; Assuming /dev/sdX is the target hard disk, and "my-root-partition"
> 
> Could you run ‘make guix.pdf’ and check whether these lines need to be
> made shorter?  If needed, maybe this could be changed to “my-root”.

"my-root" was better.

> Otherwise OK to push!

Pushed as d12717cba0.

> Thanks,
> Ludo’.

Re: [v2 1/2] doc: Explain significance of partition labels.

[Leo Famulari]

On Mon, Dec 21, 2015 at 04:35:02PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > * doc/guix.texi (Preparing for Installation): Point out relationship
> > between partition labels and the file-system configuration.
> 
> OK!

Pushed as dd81635571.

> 
> Ludo'.