Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

1 files changed, 36 insertions, 3 deletions

diff --git a/source/a/mkinitrd/mkinitrd.conf.5 b/source/a/mkinitrd/mkinitrd.conf.5
index 6cfef91ad..b28a6e080 100644
--- a/source/a/mkinitrd/mkinitrd.conf.5
+++ b/source/a/mkinitrd/mkinitrd.conf.5
@@ -58,6 +58,10 @@ image.
 This is the location for the initrd image that is created.
 .br
 Defaults to "/boot/initrd.gz"
+.br
+If %KVER% and/or %SLACKVER% are present in the string, they will be replaced 
+with $KERNEL_VERSION (e.g. "4.4.75-smp") and Slackware Version (e.g. "14.2") 
+respectively in the name of the generated file.
 
 .TP 5
 .I KERNEL_VERSION
@@ -90,10 +94,15 @@ Example: MODULE_LIST="module1:module2 option=1:module3"
 .TP 5
 .I LUKSDEV
 Contains a colon (:) delimited list of luks encrypted block devices to be
-unlocked by the initrd using cryptsetup.  All devices that must be unlocked
-in order to access the root filesystem must be specified.
-.br
+unlocked by the initrd using cryptsetup.  The list may include any of: device
+node path, UUID, or LABEL.  All devices that must be unlocked in order to
+access the root filesystem must be specified.
+.sp
 Example: LUKSDEV="/dev/sda2:/dev/sda3"
+.br
+Example: LUKSDEV="UUID=ec6dea40-c8d8-4590-850a-a757be60e45a"
+.br
+Example: LUKSDEV="LABEL=darkstar"
 
 Each unlocked device will be assigned an automatically generated luks device
 name of the form luks<device> where '<device>' will be the basename of the
@@ -113,6 +122,7 @@ then
 and
 .I "ROOTDEV=/dev/mapper/lukssda2"
 are equivalent.
+
 .TP 5
 .I LUKSKEY
 When using cryptsetup to encrypt your partition, you can use a keyfile instead
@@ -129,8 +139,20 @@ you need to set:
 LUKSKEY="LABEL=TRAVELSTICK:/keys/alien.luks"
 
 .TP 5
+.I LUKSTRIM
+Contains a colon (:) delimited list of luks encrypted block devices to be
+passed the "--allow-discards" option when unlocked by the initrd using
+cryptsetup. This has the effect of allowing TRIM on SSD drives. Be sure
+your SSD supports this feature (correctly) before enabling it.
+.br
+See fstrim(8) for more information.
+.br
+Example: LUKSTRIM="/dev/sda2:/dev/sda4"
+
+.TP 5
 .I ROOTDEV
 The device on which your root filesystem is located.
+May be a device node path, UUID, or LABEL. See LUKSDEV examples.
 .br
 Example: ROOTDEV="/dev/sda2"
 
@@ -206,6 +228,17 @@ MODCONF="0"	# Do not add /etc/modprobe.d/* to the initrd
 .br
 MODCONF="1"	# Add /etc/modprobe.d/* to the initrd
 
+.TP 5
+.I MICROCODE_ARCH
+This option specifies a cpio archive containing updated microcode for your CPU.
+CPU manufacturers occasionally release such updates to fix bugs in the microcode
+currently embedded in the CPU. The microcode archive will be prepended to the
+output initrd, where the kernel will find it for early patching.
+.br
+Examples:
+.br
+MICROCODE_ARCH="/boot/intel-ucode.cpio"
+
 .SH FILES
 .I /etc/mkinitrd.conf
 .br