Convert all remaining options to yes/no values and use isTrue for consistency

Closes: https://bugs.gentoo.org/532084
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

1 files changed, 82 insertions, 81 deletions

diff --git a/genkernel.conf b/genkernel.conf
index 6eae321..38f6bbf 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -7,146 +7,151 @@
 
 # =========Common Command Line Option Defaults=========
 
-# Should we install to $BOOTDIR?
+# Install to $BOOTDIR
 #INSTALL="yes"
 
-# Run 'make oldconfig' before compiling this kernel?
+# Run 'make oldconfig' before compiling this kernel
 OLDCONFIG="yes"
 
-# Run 'make menuconfig' before compiling this kernel?
+# Run 'make menuconfig' before compiling this kernel
 MENUCONFIG="no"
-# Run 'make gconfig' before compiling this kernel?
+
+# Run 'make gconfig' before compiling this kernel
 GCONFIG="no"
-# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel?
+
+# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel
 NCONFIG="no"
-# Run 'make xconfig' before compiling this kernel?
+
+# Run 'make xconfig' before compiling this kernel
 XCONFIG="no"
 
-# Run 'make clean' before compilation?
+# Run 'make clean' before compilation
 # If set to NO, implies MRPROPER WILL NOT be run
 # Also, if clean is NO, it won't copy over any configuration
 # file, it will use what's there.
 CLEAN="yes"
 
-# Run 'make mrproper' before configuration/compilation?
+# Run 'make mrproper' before configuration/compilation
 MRPROPER="yes"
 
-# Override the arch detection?
+# Override the arch detection
 #ARCH_OVERRIDE="x86"
 
-# Mount BOOTDIR automatically if it isn't mounted?
+# Mount BOOTDIR automatically if it isn't mounted
 MOUNTBOOT="yes"
 
-# Make symlinks in BOOTDIR automatically?
+# Make symlinks in BOOTDIR automatically
 #SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
 SAVE_CONFIG="yes"
 
-# Use Color output in Genkernel?
+# Enable color output in genkernel
 USECOLOR="yes"
 
-# Clear build cache dir
-#CLEAR_CACHE_DIR="yes"
+# Clear build cache dir on gernkernel start
+#CLEAR_CACHE_DIR="no"
 
 # Clear all tmp files and caches after genkernel has run
-#POSTCLEAR="1"
+#POSTCLEAR="no"
 
 # Genkernel uses an independent configuration for MAKEOPTS, and does not source
-# /etc/make.conf . You can override the default setting by uncommenting and
-# tweaking the following line. Default setting is set up by
+# /etc/portage/make.conf . You can override the default setting by uncommenting
+# and tweaking the following line. Default setting is set up by
 # ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j
 # argument is: <number of processors>*<number of cores per processor>+1
 #MAKEOPTS="$(portageq envvar MAKEOPTS)"
 
-# Run the kernel make at the following NICE level.  Default is 10.
-# NICE=10
+# Run the kernel make at the following NICE level
+#NICE=10
 
-# Add in LVM support from static binaries if they exist on the system, or
-# compile static LVM binaries if static ones do not exist.
+# Add LVM support
 #LVM="no"
 
-# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed.
+# Add LUKS support
 #LUKS="no"
 
-# Add in GnuPG support
+# Add GnuPG support
 #GPG="no"
 
 # Add in early microcode support: this sets the kernel options for early microcode loading
-# Acceptible values: empty/"no", "all", "intel", "amd"
+# Possible values: empty/"no", "all", "intel", "amd"
 #MICROCODE="all"
 
 # Include early microcode in generated initramfs
 # This is enabled by default for upgrade compatability, however is obsoleted by
 # sys-boot/grub-2.02-r1, which supports multiple initramfs in the bootloader.
-#MICROCODE_INITRAMFS="no"
+#MICROCODE_INITRAMFS="yes"
 
-# Add in NFS support
+# Add NFS support
 #NFS="no"
 
-# Add DMRAID support.
+# Add DMRAID support
 #DMRAID="no"
 
-# Add SSH support.
+# Add SSH support
 #SSH="no"
 
-# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
-# If included, busybox is rebuilt if the cached copy is out of date.
+# Include busybox in the initramfs. If included, busybox is rebuilt
+# if the cached copy is out of date.
 #BUSYBOX="yes"
 
-# Includes mdadm/mdmon binaries in initramfs.
-# Without sys-fs/mdadm[static] installed, this will build a static mdadm.
+# Add MDRAID support
 #MDADM="no"
 
 # Specify a custom mdadm.conf.
-# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect
+# By default the initramfs will be built *without* an mdadm.conf and will auto-detect
 # arrays during bootup.  Usually, this should not be needed.
 #MDADM_CONFIG="/etc/mdadm.conf"
 
-# Add Multipath support.
+# Add Multipath support
 #MULTIPATH="no"
 
-# Add iSCSI support.
+# Add iSCSI support
 #ISCSI="no"
 
-# Add e2fsprogs support.
+# Add e2fsprogs support
 #E2FSPROGS="no"
 
 # Include support for unionfs
-#UNIONFS="1"
+#UNIONFS="no"
 
-# Include support for zfs volume management.
+# Include support for zfs volume management.  If unset, genkernel will attempt
+# to autodetect and enable this when rootfs is on zfs.
 #ZFS="no"
 
-# Add BTRFS support.
+# Add BTRFS support
 #BTRFS="no"
 
 # Install firmware onto root filesystem
 # Will conflict with sys-kernel/linux-firmware package
 #FIRMWARE_INSTALL="no"
 
-# Enable copying of firmware into initramfs
+# Add firmware(s) to initramfs
 #FIRMWARE="no"
+
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
+
 # Specify a space-separated list of firmware files or directories to include,
 # relative to FIRMWARE_DIR.  If empty or unset, the full contents of 
 # FIRMWARE_DIR will be included.
 #FIRMWARE_FILES=""
 
-# Enable disklabel support (copies blkid to initrd)
+# Add disklabel support (copies blkid to initramfs)
 DISKLABEL="yes"
 
-# Add new kernel to grub?
-#BOOTLOADER="grub"
+# Add new kernel to grub
+# Possible values: empty/"no", "grub", "grub2"
+#BOOTLOADER=""
 
-# Enable splashutils in early space (initrd). Default is "no".
-#SPLASH="yes"
+# Add boot splash using splashutils
+#SPLASH="no"
 
 # Use this splash theme. If commented out - the "default" name theme is used.
-# Also, SPLASH="yes" needs to be enabled for this one to one work.
-# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
+# Also, SPLASH="yes" needs to be enabled for this one to work.
+# This supersedes the "SPLASH_THEME" option in /etc/conf.d/splash .
 #SPLASH_THEME="gentoo"
 
 # Run the specified command in the current environment after the kernel and
@@ -155,14 +160,14 @@ DISKLABEL="yes"
 # files (use 'copy_image_with_preserve dtb path/to/dtb dtb ${KNAME}-${ARCH}-${KV}')
 #CMD_CALLBACK=""
 
+
 # =========Keymap Settings=========
 #
 # Force keymap selection at boot
-#DOKEYMAPAUTO="yes"
-
+#DOKEYMAPAUTO="no"
 
-# Disables keymap selection support
-#KEYMAP="0"
+# Enables keymap selection support
+#KEYMAP="yes"
 
 
 # =========Low Level Compile Settings=========
@@ -197,11 +202,9 @@ DISKLABEL="yes"
 # option.
 #UTILS_LD="ld"
 
-
 # Common prefix of cros compile commands
 #UTILS_CROSS_COMPILE="x86_64-pc-linux-gnu"
 
-
 # Value of CROSS_COMPILE utils variable
 # during kernel compilation
 #KERNEL_CROSS_COMPILE="x86_64-pc-linux-gnu"
@@ -214,12 +217,14 @@ DISKLABEL="yes"
 # command line option. Useful to install a uImage on arm
 #KERNEL_BINARY_OVERRIDE="arch/foo/boot/bar"
 
+
 # =========GENKERNEL LOCATION CONFIGURATION============
+#
 # Variables:
 #   %%ARCH%%  - Final determined architecture
 #   %%CACHE%% - Final determined cache location
 
-# Set genkernel's temporary work directory.  Default is /var/tmp/genkernel
+# Set genkernel's temporary work directory
 #TMPDIR="/var/tmp/genkernel"
 
 # Set the boot directory, default is /boot
@@ -230,17 +235,22 @@ GK_SHARE="${GK_SHARE:-/usr/share/genkernel}"
 
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel"
+
 # Location of DISTDIR, where our source tarballs are stored
 DISTDIR="${GK_SHARE}/distfiles"
+
 # Log output file
 LOGFILE="/var/log/genkernel.log"
+
 # Debug Level
 LOGLEVEL=1
 
+
 # =========COMPILED UTILS CONFIGURATION============
 #
 # Default location of kernel source
 DEFAULT_KERNEL_SOURCE="/usr/src/linux"
+
 # Default kernel config (only use to override using
 # arch/%%ARCH%%/kernel-config-${VER}.${PAT} !)
 #DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
@@ -250,7 +260,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
 # NOTE: Since genkernel 3.4.41 the version of
-#   busybox, lvm, mdadm, .. have been moved to
+#   busybox, lvm, mdadm, ... have been moved to
 #   /usr/share/genkernel/defaults/software.sh in order to
 #   reduce the merging you have to do during etc-update.
 #   You can still override these settings in here.
@@ -258,32 +268,27 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 
 # =========MISC KERNEL CONFIGURATION============
 #
-# Tag the kernel and ramdisk with a name:
+# Tag the kernel and initramfs with a name:
 # If not defined the option defaults to
 # 'genkernel'
 #KNAME="genkernel"
 
-
 # This option is only valid if kerncache is
 # defined. If there is a valid kerncache no checks
 # will be made against a kernel source tree
-#KERNEL_SOURCES="0"
-
+#KERNEL_SOURCES="yes"
 
 # Build a static (monolithic kernel)
-#BUILD_STATIC="1"
-
+#BUILD_STATIC="no"
 
 # Make and install kernelz image (PowerPC)
-#GENZIMAGE="1"
-
+#GENZIMAGE="no"
 
 # File to output a .tar.bz2'd kernel contents
 # of /lib/modules/ and the kernel config
 # NOTE: This is created before the callbacks
 # are run!
-#KERNCACHE="/path/to/file"
-
+#KERNCACHE="/path/to/file.bz2"
 
 # Prefix to kernel module destination, modules
 # will be installed in <prefix>/lib/modules
@@ -291,22 +296,20 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #INSTALL_MOD_PATH=""
 
 
-# =========MISC INITRD CONFIGURATION============
+# =========MISC INITRAMFS CONFIGURATION============
 #
-# Copy all kernel modules to the ramdisk
-#ALLRAMDISKMODULES="1"
+# Copy all compiled kernel modules to the initramfs
+#ALLRAMDISKMODULES="no"
 
+# Copy selected modules to the initramfs based on arch-specific modules_load file
+#RAMDISKMODULES="yes"
 
-# Don't copy any modules to the ramdisk
-#RAMDISKMODULES="0"
-
-
-# File to output a .tar.bz2'd kernel and ramdisk:
-# No modules outside of the ramdisk will be
+# File to output a .tar.bz2'd kernel and initramfs:
+# No modules outside of the initramfs will be
 # included...
 #MINKERNPACKAGE="/path/to/file.bz2"
 
-# Add additional modules to the ramdisk using the module groups defined
+# Add additional modules to the initramfs using the module groups defined
 # in /usr/share/genkernel/defaults/modules_load (see this file for
 # more details).  This would be used if, for example, you
 # required an additional crypto module or network device at boot
@@ -316,7 +319,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Use this with caution.
 #AMODULES_group="module-to-include another-module"
 
-# Override the default modules in the ramdisk, for a given group, as defined by
+# Override the default modules in the initramfs, for a given group, as defined by
 # /usr/share/genkernel/defaults/modules_load and the per-arch modules_load
 # files. You PROBABLY want to use AMODULES_* above, and NOT MODULES_* here.
 # If you use MODULES_* here, the default and per-arch modules will NOT be used.
@@ -327,19 +330,17 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # callbacks have run
 #MODULESPACKAGE="/path/to/file.bz2"
 
-
 # Directory structure to include in the initramfs,
 # only available on >=2.6 kernels
 #INITRAMFS_OVERLAY=""
 
-
 # Build the generated initramfs into the kernel instead of
 # keeping it as a separate file
-#INTEGRATED_INITRAMFS="1"
-
+#INTEGRATED_INITRAMFS="no"
 
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
+
 # Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
 # "best" selects the best available compression method
 # "fastest" selects the fastest available compression method
@@ -349,7 +350,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # WRAP_INITRD=no
 
 # Create a self-contained env in the initramfs
-#NETBOOT="1"
+#NETBOOT="no"
 
 
 # =========MISC BOOT CONFIGURATION============