diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build.scm | 26 | ||||
| -rw-r--r-- | doc/guix.texi | 16 |
2 files changed, 21 insertions, 21 deletions
diff --git a/doc/build.scm b/doc/build.scm index 2cd57b4a92..9ab2ca32d2 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -365,7 +365,7 @@ actual file name." #:languages languages)) (syntax-css-url - "/static/base/css/code.css")) + "/themes/initial/css/code.css")) "Return a derivation called NAME that processes all the HTML files in INPUT to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')." @@ -624,7 +624,7 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')." #:key (languages %languages) (manual %manual) - (manual-css-url "/static/base/css/manual.css")) + (manual-css-url "/themes/initial/css/manual.css")) "Process all the HTML files in INPUT; add them MANUAL-CSS-URL as a <style> link, and add a menu to choose among LANGUAGES. Use the Guix PO files found in SOURCE." @@ -741,7 +741,7 @@ in SOURCE." (list (menu-dropdown #:label `(img (@ (alt "Language") - (src "/static/base/img/language-picker.svg"))) + (src "/themes/initial/img/language-picker.svg"))) #:items (language-menu-items file))) #:split-node? split-node?) @@ -1141,16 +1141,16 @@ must be the Guix top-level source directory, from which PO files are taken." ;; Menu prefetch. (link (@ (rel "prefetch") (href ,(guix-url "menu/index.html")))) ;; Base CSS. - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/elements.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/common.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/messages.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/navbar.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/breadcrumbs.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/buttons.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/footer.css")))) - - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/page.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/post.css"))))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/elements.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/common.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/messages.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/navbar.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/breadcrumbs.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/buttons.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/footer.css")))) + + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/page.css")))) + (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/post.css"))))) (body (header (@ (class "navbar")) (h1 (a (@ (class "branding") diff --git a/doc/guix.texi b/doc/guix.texi index 5d7906f57b..a3ba7164eb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2728,20 +2728,20 @@ the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @code{man cryptsetup}} for more information). @quotation Warning -Note that GRUB can unlock LUKS2 devices since version 2.06, but only -supports the PBKDF2 key derivation function, which is not the default -for @command{cryptsetup luksFormat}. You can check which key derivation -function is being used by a device by running @command{cryptsetup -luksDump @var{device}}, and looking for the PBKDF field of your -keyslots. +While efforts are in progress to extend support to LUKS2, please note +that Guix only supports devices of type LUKS1 at the moment. You can +verify that your existing LUKS device is of the right type by running +@command{cryptsetup luksDump @var{device}}. Alternatively, you can +create a new LUKS1 device with @command{cryptsetup luksFormat --type +luks1 @var{device}}. @end quotation Assuming you want to store the root partition on @file{/dev/sda2}, the -command sequence to format it as a LUKS2 partition would be along these +command sequence to format it as a LUKS1 partition would be along these lines: @example -cryptsetup luksFormat --type luks2 --pbkdf pbkdf2 /dev/sda2 +cryptsetup luksFormat --type luks1 /dev/sda2 cryptsetup open /dev/sda2 my-partition mkfs.ext4 -L my-root /dev/mapper/my-partition @end example |