commit:     b79bf458363f70195715111468f445144e96b7e0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 02:06:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 02:06:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b79bf458

sys-fs/cryptsetup[static] isn't required since 2012 anymore ...

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 doc/genkernel.8.txt | 9 ++++-----
 gen_initramfs.sh    | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 26196db..54ea00a 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -335,8 +335,7 @@ INITIALIZATION
     Includes or excludes disk label and uuid support in your initrd.
 
 *--*[*no-*]*luks*::
-    Includes or excludes Luks support from static binaries if they exist on
-    the system.
+    Includes or excludes LUKS support.
 
 *--*[*no-*]*gpg*::
     Includes or excludes support for GnuPG 1.x, the portable standalone branch
@@ -461,11 +460,11 @@ recognized by the kernel itself.
     Does the same as *root*=, which should be used in its place.
 
 *crypt_root*=<...>::
-    This specifies the device encrypted by Luks, which contains the
+    This specifies the device encrypted by LUKS, which contains the
     root filesystem to mount.
 
 *crypt_swap*=<...>::
-    This specifies the swap device encrypted by Luks.
+    This specifies the swap device encrypted by LUKS.
 
 *root_key*=<...>::
     In case your root is encrypted with a key, you can use a device
@@ -478,7 +477,7 @@ recognized by the kernel itself.
     look for the device in every boot.
 
 *root_trim*=(yes|no)::
-    Enables TRIM support for a Luks-based root device.  Only useful
+    Enables TRIM support for a LUKS-based root device.  Only useful
     with SSD setups.  Have a look at 'https://en.wikipedia.org/wiki/TRIM'
     for more information.
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d684844..1469aaa 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -649,7 +649,7 @@ append_overlay(){
 }
 
 append_luks() {
-       local _luks_error_format="LUKS support cannot be included: %s. Please 
emerge sys-fs/cryptsetup[static]."
+       local _luks_error_format="LUKS support cannot be included: %s. Please 
emerge sys-fs/cryptsetup."
        local _luks_source=/sbin/cryptsetup
        local _luks_dest=/sbin/cryptsetup
 

Reply via email to