commit: 6454b9ed43325149f3ccb3bab35a42b745d0369b Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Mar 23 00:47:17 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 08:05:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6454b9ed
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 <AT> gentoo.org> gen_bootloader.sh | 6 +- gen_cmdline.sh | 90 ++++++++++++++-------------- gen_configkernel.sh | 26 ++++---- gen_determineargs.sh | 12 ++-- gen_funcs.sh | 16 ++--- gen_initramfs.sh | 18 +++--- gen_moddeps.sh | 2 +- gen_package.sh | 20 +++---- genkernel | 66 ++++++++++----------- genkernel.conf | 163 ++++++++++++++++++++++++++------------------------- 10 files changed, 211 insertions(+), 208 deletions(-) diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 28fa292..2a0a43d 100755 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -53,7 +53,7 @@ set_bootloader_grub2() { grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null || grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub-mkconfig failed" - [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}" + isTrue "${BUILD_RAMDISK}" && sed -i 's/ro single/ro debug/' "${GRUB_CONF}" } set_bootloader_grub() { @@ -93,11 +93,11 @@ set_bootloader_grub() { echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF} echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF} printf "%b\n" "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF} - if [ "${BUILD_INITRD}" = '1' ] + if isTrue "${BUILD_RAMDISK}" then if [ "${PAT}" -gt '4' ] then - printf "%b\n" "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} + printf "%b\n" "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} fi fi echo >> ${GRUB_CONF} diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 853723b..37a078b 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -214,8 +214,8 @@ usage() { } parse_optbool() { - local opt=${1/--no-*/0} # false - opt=${opt/--*/1} # true + local opt=${1/--no-*/no} # false + opt=${opt/--*/yes} # true echo $opt } @@ -296,8 +296,8 @@ parse_cmdline() { print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}" ;; --do-keymap-auto) - CMD_DOKEYMAPAUTO=1 - CMD_KEYMAP=1 + CMD_DOKEYMAPAUTO="yes" + CMD_KEYMAP="yes" print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}" ;; --keymap|--no-keymap) @@ -317,7 +317,7 @@ parse_cmdline() { --mdadm|--no-mdadm) CMD_MDADM=`parse_optbool "$*"` print_info 2 "CMD_MDADM: $CMD_MDADM" - if [ "$CMD_MDADM" = "1" -a ! -e /sbin/mdadm ] + if isTrue "${CMD_MDADM}" && [ ! -e /sbin/mdadm ] then print_warning 'Warning: --mdadm generally requires sys-fs/mdadm present on the host system' fi @@ -332,8 +332,8 @@ parse_cmdline() { ;; --microcode|--no-microcode) case `parse_optbool "$*"` in - 0) CMD_MICROCODE='no' ;; - 1) CMD_MICROCODE='all' ;; + no) CMD_MICROCODE='no' ;; + yes) CMD_MICROCODE='all' ;; esac print_info 2 "CMD_MICROCODE: ${CMD_MICROCODE}" ;; @@ -363,16 +363,16 @@ parse_cmdline() { ;; --dmraid|--no-dmraid) CMD_DMRAID=`parse_optbool "$*"` - if [ "$CMD_DMRAID" = "1" -a ! -e /usr/sbin/dmraid ] + if isTrue "${CMD_DMRAID}" && [ ! -e /usr/sbin/dmraid ] then - echo 'Error: --dmraid requires sys-fs/dmraid' - echo ' to be installed on the host system.' + echo 'Error: --dmraid requires sys-fs/dmraid' \ + 'to be installed on the host system.' exit 1 fi - if [ "$CMD_DMRAID" = "1" -a ! -e /usr/include/libdevmapper.h ] + if isTrue "${CMD_DMRAID}" && [ ! -e /usr/include/libdevmapper.h ] then - echo 'Error: --dmraid requires sys-fs/lvm2' - echo ' to be installed on the host system.' + echo 'Error: --dmraid requires sys-fs/lvm2' \ + 'to be installed on the host system.' exit 1 fi print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" @@ -395,16 +395,16 @@ parse_cmdline() { ;; --multipath|--no-multipath) CMD_MULTIPATH=`parse_optbool "$*"` - if [ "$CMD_MULTIPATH" = "1" -a ! -e /sbin/multipath ] + if isTrue "${CMD_MULTIPATH}" && [ ! -e /sbin/multipath ] then - echo 'Error: --multipath requires sys-fs/multipath-tools' - echo ' to be installed on the host system.' + echo 'Error: --multipath requires sys-fs/multipath-tools' \ + 'to be installed on the host system.' exit 1 fi - if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ] + if isTrue "${CMD_MULTIPATH}" && [ ! -e /usr/include/libdevmapper.h ] then - echo 'Error: --multipath requires sys-fs/lvm2' - echo ' to be installed on the host system.' + echo 'Error: --multipath requires sys-fs/lvm2' \ + 'to be installed on the host system.' exit 1 fi print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}" @@ -435,15 +435,15 @@ parse_cmdline() { TERM_COLUMNS=`stty -a | head -n 1 | cut -d\ -f7 | cut -d\; -f1` if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]] then - echo "Error: You need a terminal with at least 80 columns" - echo " and 19 lines for --menuconfig; try --no-menuconfig..." + echo 'Error: You need a terminal with at least 80 columns' \ + 'and 19 lines for --menuconfig; try --no-menuconfig...' exit 1 fi - CMD_MENUCONFIG=1 + CMD_MENUCONFIG="yes" print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}" ;; --no-menuconfig) - CMD_MENUCONFIG=0 + CMD_MENUCONFIG="no" print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}" ;; --nconfig) @@ -451,15 +451,15 @@ parse_cmdline() { TERM_COLUMNS=`stty -a | head -n 1 | cut -d\ -f7 | cut -d\; -f1` if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]] then - echo "Error: You need a terminal with at least 80 columns" - echo " and 19 lines for --nconfig; try --no-nconfig..." + echo 'Error: You need a terminal with at least 80 columns' \ + 'and 19 lines for --nconfig; try --no-nconfig...' exit 1 fi - CMD_NCONFIG=1 + CMD_NCONFIG="yes" print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}" ;; --no-nconfig) - CMD_NCONFIG=0 + CMD_NCONFIG="no" print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}" ;; --gconfig|--no-gconfig) @@ -484,12 +484,12 @@ parse_cmdline() { ;; --oldconfig|--no-oldconfig) CMD_OLDCONFIG=`parse_optbool "$*"` - [ "$CMD_OLDCONFIG" = "1" ] && CMD_CLEAN=0 + isTrue "${CMD_OLDCONFIG}" && CMD_CLEAN="no" print_info 2 "CMD_CLEAN: ${CMD_CLEAN}" print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}" ;; --gensplash=*) - CMD_SPLASH=1 + CMD_SPLASH="yes" SPLASH_THEME="${*#*=}" print_info 2 "CMD_SPLASH: ${CMD_SPLASH}" print_info 2 "SPLASH_THEME: ${SPLASH_THEME}" @@ -504,7 +504,7 @@ parse_cmdline() { print_warning 1 "Please use --splash, as --gensplash is deprecated." ;; --splash=*) - CMD_SPLASH=1 + CMD_SPLASH="yes" SPLASH_THEME="${*#*=}" print_info 2 "CMD_SPLASH: ${CMD_SPLASH}" print_info 2 "SPLASH_THEME: ${SPLASH_THEME}" @@ -653,12 +653,12 @@ parse_cmdline() { ;; --firmware-dir=*) CMD_FIRMWARE_DIR="${*#*=}" - CMD_FIRMWARE=1 + CMD_FIRMWARE="yes" print_info 2 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}" ;; --firmware-files=*) CMD_FIRMWARE_FILES="${*#*=}" - CMD_FIRMWARE=1 + CMD_FIRMWARE="yes" print_info 2 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}" ;; --firmware-install|--no-firmware-install) @@ -692,7 +692,7 @@ parse_cmdline() { CMD_NICE="${*#*=}" if [ ${CMD_NICE} -lt 0 -o ${CMD_NICE} -gt 19 ] then - echo "Error: Illegal value specified for --nice= parameter." + echo 'Error: Illegal value specified for --nice= parameter.' exit 1 fi print_info 2 "CMD_NICE: ${CMD_NICE}" @@ -710,23 +710,25 @@ parse_cmdline() { print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}" ;; all) - BUILD_KERNEL=1 - BUILD_MODULES=1 - BUILD_RAMDISK=1 + BUILD_KERNEL="yes" + BUILD_MODULES="yes" + BUILD_RAMDISK="yes" ;; ramdisk|initramfs) - BUILD_RAMDISK=1 + BUILD_KERNEL="no" + BUILD_MODULES="no" + BUILD_RAMDISK="yes" ;; kernel) - BUILD_KERNEL=1 - BUILD_MODULES=1 - BUILD_RAMDISK=0 + BUILD_KERNEL="yes" + BUILD_MODULES="yes" + BUILD_RAMDISK="no" ;; bzImage) - BUILD_KERNEL=1 - BUILD_MODULES=0 - BUILD_RAMDISK=0 - CMD_RAMDISKMODULES=0 + BUILD_KERNEL="yes" + BUILD_MODULES="no" + BUILD_RAMDISK="no" + CMD_RAMDISKMODULES="no" print_info 2 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}" ;; --help) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 4242385..5d4bf23 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -36,7 +36,7 @@ config_kernel() { determine_config_file cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!' - if isTrue ${MRPROPER} + if isTrue "${MRPROPER}" then # Backup current kernel .config if [ -f "${KERNEL_OUTPUTDIR}/.config" ] @@ -92,16 +92,16 @@ config_kernel() { fi local add_config - if isTrue ${MENUCONFIG} + if isTrue "${MENUCONFIG}" then add_config=menuconfig - elif isTrue ${CMD_NCONFIG} + elif isTrue "${CMD_NCONFIG}" then add_config=nconfig - elif isTrue ${CMD_GCONFIG} + elif isTrue "${CMD_GCONFIG}" then add_config=gconfig - elif isTrue ${CMD_XCONFIG} + elif isTrue "${CMD_XCONFIG}" then add_config=xconfig fi @@ -114,7 +114,7 @@ config_kernel() { fi # Force this on if we are using --genzimage - if isTrue ${CMD_GENZIMAGE} + if isTrue "${CMD_GENZIMAGE}" then # Make sure Ext2 support is on... kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" @@ -153,7 +153,7 @@ config_kernel() { esac # Make sure lvm modules are on if --lvm - if isTrue ${CMD_LVM} + if isTrue "${CMD_LVM}" then cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT") case "$cfg_CONFIG_DM_SNAPSHOT" in @@ -171,7 +171,7 @@ config_kernel() { fi # Multipath - if isTrue ${CMD_MULTIPATH} + if isTrue "${CMD_MULTIPATH}" then cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH") case "$cfg_CONFIG_DM_MULTIPATH" in @@ -189,7 +189,7 @@ config_kernel() { fi # Make sure dmraid modules are on if --dmraid - if isTrue ${CMD_DMRAID} + if isTrue "${CMD_DMRAID}" then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" fi @@ -197,7 +197,7 @@ config_kernel() { # Make sure iSCSI modules are enabled in the kernel, if --iscsi # CONFIG_SCSI_ISCSI_ATTRS # CONFIG_ISCSI_TCP - if isTrue ${CMD_ISCSI} + if isTrue "${CMD_ISCSI}" then cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS") case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in @@ -220,7 +220,7 @@ config_kernel() { fi # Make sure HyperV modules are enabled in the kernel, if --hyperv - if isTrue ${CMD_HYPERV} + if isTrue "${CMD_HYPERV}" then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "y" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "y" @@ -234,14 +234,14 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "y" fi - if isTrue ${SPLASH} + if isTrue "${SPLASH}" then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y" fi # VirtIO - if isTrue ${CMD_VIRTIO} + if isTrue "${CMD_VIRTIO}" then for k in \ CONFIG_VIRTIO \ diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 2879287..fdfcef9 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -2,7 +2,7 @@ # $Id$ get_KV() { - if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ] + if ! isTrue "${KERNEL_SOURCES}" && [ -e "${KERNCACHE}" ] then /bin/tar -x -C ${TEMP} -f ${KERNCACHE} kerncache.config if [ -e ${TEMP}/kerncache.config ] @@ -181,7 +181,7 @@ determine_real_args() { fi fi - if [ "${KERNEL_SOURCES}" != "0" ] + if isTrue "${KERNEL_SOURCES}" then if [ ! -d ${KERNEL_DIR} ] then @@ -191,11 +191,11 @@ determine_real_args() { if [ -z "${KERNCACHE}" ] then - if [ "${KERNEL_DIR}" = '' -a "${KERNEL_SOURCES}" != "0" ] + if [ "${KERNEL_DIR}" = '' ] && isTrue "${KERNEL_SOURCES}" then gen_die 'No kernel source directory!' fi - if [ ! -e "${KERNEL_DIR}" -a "${KERNEL_SOURCES}" != "0" ] + if [ ! -e "${KERNEL_DIR}" ] && isTrue "${KERNEL_SOURCES}" then gen_die 'No kernel source directory!' fi @@ -210,9 +210,9 @@ determine_real_args() { # imply --no-mrproper. if [ "${CMD_CLEAN}" != '' ] then - if ! isTrue ${CLEAN} + if ! isTrue "${CLEAN}" then - MRPROPER=0 + MRPROPER="no" fi fi diff --git a/gen_funcs.sh b/gen_funcs.sh index 618aab6..c5eb28e 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -23,7 +23,7 @@ isTrue() { } setColorVars() { -if isTrue ${USECOLOR} +if isTrue "${USECOLOR}" then GOOD=$'\e[32;01m' WARN=$'\e[33;01m' @@ -205,7 +205,7 @@ gen_die() { print_error 1 "-- Grepping log... --" print_error 1 '' - if isTrue ${USECOLOR} + if isTrue "${USECOLOR}" then GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} \ | sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|" @@ -258,12 +258,12 @@ setup_cache_dir() [ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}" -if [ "${CLEAR_CACHE_DIR}" == 'yes' ] +if isTrue "${CLEAR_CACHE_DIR}" then print_info 1 "Clearing cache dir contents from ${CACHE_DIR}" while read i do - print_info 1 " >> removing ${i}" + print_info 1 "$(getIndent 1)>> removing ${i}" rm "${i}" done < <(find "${CACHE_DIR}" -maxdepth 2 -type f -name '*.tar.*' -o -name '*.bz2') fi @@ -272,7 +272,7 @@ fi clear_tmpdir() { -if isTrue ${CMD_INSTALL} +if isTrue "${CMD_INSTALL}" then TMPDIR_CONTENTS=`ls ${TMPDIR}` print_info 1 "Removing tmp dir contents" @@ -313,7 +313,7 @@ copy_image_with_preserve() { # Old product might be a different version. If so, we need to read # the symlink to see what it's name is, if there are symlinks. cd ${KERNEL_OUTPUTDIR} - if [ "${SYMLINK}" = '1' ] + if isTrue "${SYMLINK}" then print_info 4 "automatically managing symlinks and old images." 1 0 if [ -e "${BOOTDIR}/${symlinkName}" ] @@ -359,7 +359,7 @@ copy_image_with_preserve() { # When symlinks are not being managed by genkernel, old symlinks might # still be useful. Leave 'em alone unless managed. - if [ "${SYMLINK}" = '1' ] + if isTrue "${SYMLINK}" then print_info 5 " Deleting old symlinks, if any." rm -f "${BOOTDIR}/${symlinkName}" @@ -405,7 +405,7 @@ copy_image_with_preserve() { cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" || gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!" - if [ "${SYMLINK}" = '1' ] + if isTrue "${SYMLINK}" then print_info 5 " Make new symlink(s) (from ${BOOTDIR}):" print_info 5 " ${symlinkName} -> ${currDestImage}" diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 3ed560e..4bb45c7 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -210,7 +210,7 @@ append_blkid(){ cd ${TEMP} mkdir -p "${TEMP}/initramfs-blkid-temp/" - if [[ "${DISKLABEL}" = "1" ]]; then + if isTrue "${DISKLABEL}"; then copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid fi @@ -457,7 +457,7 @@ append_mdadm(){ cd ${TEMP} mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/" mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/" - if [ "${MDADM}" = '1' ] + if isTrue "${MDADM}" then if [ -n "${MDADM_CONFIG}" ] then @@ -658,7 +658,7 @@ append_luks() { mkdir -p "${TEMP}/initramfs-luks-temp/sbin" cd "${TEMP}/initramfs-luks-temp" - if isTrue ${LUKS} + if isTrue "${LUKS}" then [ -x "${_luks_source}" ] \ || gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")" @@ -884,7 +884,7 @@ append_auxilary() { cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init" print_info 2 "$(getIndent 1)>> Copying user specified linuxrc: ${CMD_LINUXRC} to init" else - if isTrue ${NETBOOT} + if isTrue "${NETBOOT}" then cp "${GK_SHARE}/netboot/linuxrc.x" "${TEMP}/initramfs-aux-temp/init" else @@ -932,11 +932,11 @@ append_auxilary() { done echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults" - if isTrue $CMD_DOKEYMAPAUTO + if isTrue "${CMD_DOKEYMAPAUTO}" then echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults fi - if isTrue $CMD_KEYMAP + if isTrue "${CMD_KEYMAP}" then print_info 1 "$(getIndent 1)>> Copying keymaps" mkdir -p "${TEMP}/initramfs-aux-temp/lib/" @@ -950,7 +950,7 @@ append_auxilary() { chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.scripts" chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.defaults" - if isTrue ${NETBOOT} + if isTrue "${NETBOOT}" then cd "${GK_SHARE}/netboot/misc" cp -pPRf * "${TEMP}/initramfs-aux-temp/" @@ -969,7 +969,7 @@ append_data() { local func="append_${name}" [ $# -eq 0 ] && gen_die "append_data() called with zero arguments" - if [ $# -eq 1 ] || isTrue ${var} + if [ $# -eq 1 ] || isTrue "${var}" then print_info 1 "$(getIndent 1)>> Appending ${name} cpio data..." ${func} || gen_die "${func}() failed" @@ -1003,7 +1003,7 @@ create_initramfs() { append_data 'multipath' "${MULTIPATH}" append_data 'gpg' "${GPG}" - if [ "${RAMDISKMODULES}" = '1' ] + if isTrue "${RAMDISKMODULES}" then append_data 'modules' else diff --git a/gen_moddeps.sh b/gen_moddeps.sh index 053a183..ffc4d31 100755 --- a/gen_moddeps.sh +++ b/gen_moddeps.sh @@ -60,7 +60,7 @@ gen_deps() gen_dep_list() { - if [ "${ALLRAMDISKMODULES}" = "1" ]; then + if isTrue "${ALLRAMDISKMODULES}"; then strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort else local group_modules diff --git a/gen_package.sh b/gen_package.sh index d82322f..2dc701d 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -39,7 +39,7 @@ gen_minkernpackage() { if ! isTrue "${INTEGRATED_INITRAMFS}" then - [ "${BUILD_RAMDISK}" != '0' ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; } + isTrue "${BUILD_RAMDISK}" && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; } fi if [ "${KERNCACHE}" != "" ] @@ -74,6 +74,7 @@ gen_modulespackage() { print_info 3 "Created modules package: $(readlink -f ${MODULESPACKAGE})" cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1 } + gen_kerncache() { print_info 1 'Creating kernel cache' @@ -112,7 +113,7 @@ gen_kerncache() if [ -d ${INSTALL_MOD_PATH}/lib/modules/${KV} ] then - cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules" + cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules" fi cd "${TEMP}/kerncache" @@ -142,10 +143,10 @@ gen_kerncache_extract_kernel() gen_kerncache_extract_modules() { - if [ -e "${KERNCACHE}" ] + if [ -e "${KERNCACHE}" ] then print_info 1 'Extracting kerncache kernel modules' - if [ "${INSTALL_MOD_PATH}" != '' ] + if [ "${INSTALL_MOD_PATH}" != '' ] then /bin/tar -xf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib else @@ -160,25 +161,24 @@ gen_kerncache_extract_config() then print_info 1 'Extracting kerncache config to /etc/kernels' mkdir -p /etc/kernels - /bin/tar -xf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV} + /bin/tar -xf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV} mv /etc/kernels/config-${ARCH}-${KV} /etc/kernels/kernel-config-${ARCH}-${KV} fi } gen_kerncache_is_valid() { - KERNCACHE_IS_VALID=0 + KERNCACHE_IS_VALID="no" if [ "${NO_KERNEL_SOURCES}" = '1' ] then - - BUILD_KERNEL=0 + BUILD_KERNEL="no" # Can make this more secure .... /bin/tar -xf ${KERNCACHE} -C ${TEMP} if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ] then print_info 1 'Valid kernel cache found; no sources will be used' - KERNCACHE_IS_VALID=1 + KERNCACHE_IS_VALID="yes" fi else if [ -e "${KERNCACHE}" ] @@ -214,7 +214,7 @@ gen_kerncache_is_valid() echo print_info 1 "No kernel configuration change, skipping kernel build..." echo - KERNCACHE_IS_VALID=1 + KERNCACHE_IS_VALID="yes" fi fi fi diff --git a/genkernel b/genkernel index a5ce560..59d8c2f 100755 --- a/genkernel +++ b/genkernel @@ -58,7 +58,7 @@ cleanup(){ rm -rf "$TEMP" fi - if isTrue ${POSTCLEAR} + if isTrue "${POSTCLEAR}" then echo print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP' @@ -78,9 +78,9 @@ cleanup(){ } trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL -BUILD_KERNEL=0 -BUILD_RAMDISK=0 -BUILD_MODULES=0 +BUILD_KERNEL="no" +BUILD_RAMDISK="no" +BUILD_MODULES="no" # Parse all command line options... Options=$* # Save for later @@ -91,7 +91,7 @@ do done # Check if no action is specified... -if [ "${BUILD_KERNEL}" = '0' -a "${BUILD_RAMDISK}" = '0' ] +if ! isTrue "${BUILD_KERNEL}" && ! isTrue "${BUILD_RAMDISK}" then usage exit 1 @@ -156,10 +156,10 @@ dump_debugcache NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..." print_info 1 ".. with config file ${KERNEL_CONFIG}" -# Check BOOTDIR is mounted -if ! isTrue ${CMD_INSTALL} +# Check if BOOTDIR is mounted +if ! isTrue "${CMD_INSTALL}" then - isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot' + isTrue "${MOUNTBOOT}" && print_info 2 'Skipping automatic mount of boot' else [[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory" @@ -167,7 +167,7 @@ else then if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab then - if isTrue ${MOUNTBOOT} + if isTrue "${MOUNTBOOT}" then if ! mount ${BOOTDIR} then @@ -184,7 +184,7 @@ else fi elif isBootRO then - if isTrue ${MOUNTBOOT} + if isTrue "${MOUNTBOOT}" then if ! mount -o remount,rw ${BOOTDIR} then @@ -220,13 +220,13 @@ fi # echo #fi -KERNCACHE_IS_VALID=0 +KERNCACHE_IS_VALID="no" if [ "${KERNCACHE}" != "" ] then gen_kerncache_is_valid fi -if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" = '0' ] +if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}" then # Configure kernel config_kernel @@ -243,12 +243,12 @@ then compile_kernel # Compile modules - if [ "${BUILD_MODULES}" = '1' -a "${BUILD_STATIC}" = '0' ] + if isTrue "${BUILD_MODULES}" && ! isTrue "${BUILD_STATIC}" then compile_modules fi - if [ "${SAVE_CONFIG}" = '1' ] + if isTrue "${SAVE_CONFIG}" then print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}" [ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels @@ -260,15 +260,15 @@ fi if isTrue "${CMD_INSTALL}" then - if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] + if [ "${KERNCACHE}" != "" ] && isTrue "${KERNCACHE_IS_VALID}" then gen_kerncache_extract_kernel fi fi -if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] +if [ "${KERNCACHE}" != "" ] && isTrue "${KERNCACHE_IS_VALID}" then - [ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules + ! isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules gen_kerncache_extract_config fi @@ -305,7 +305,7 @@ then print_info 1 "" 1 0 fi -if [ "${BUILD_RAMDISK}" = '1' ] +if isTrue "${BUILD_RAMDISK}" then # Compile initramfs create_initramfs @@ -313,7 +313,7 @@ else print_info 1 'initrd: Not building since only the kernel was requested...' fi -if isTrue "${INTEGRATED_INITRAMFS}" #|| [ "${BUILD_KERNEL}" = '1' -a "${KERNCACHE_IS_VALID}" == "0" ] +if isTrue "${INTEGRATED_INITRAMFS}" then # We build the kernel a second time to include the initramfs compile_kernel @@ -326,7 +326,7 @@ fi # Clean up... [ -n "${CTEMP}" ] && rm -rf "${TEMP}" -if [ "${BUILD_KERNEL}" = '1' ] +if isTrue "${BUILD_KERNEL}" then if isTrue "${CMD_INSTALL}" then @@ -337,7 +337,7 @@ then print_info 1 '' print_info 1 'Required Kernel Parameters:' print_info 1 ' root=/dev/$ROOT' - if [ "${BUILD_RAMDISK}" = '0' ] + if ! isTrue "${BUILD_RAMDISK}" then print_info 1 ' [ And "vga=0x317 splash=verbose" if you use a framebuffer ]' print_info 1 '' @@ -353,22 +353,22 @@ then fi fi -if [ "${BUILD_RAMDISK}" = '1' ] +if isTrue "${BUILD_RAMDISK}" then echo print_warning 1 'WARNING... WARNING... WARNING...' print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...' - [ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]" - [ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support' - [ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support' - [ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support' - [ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid=<additional options>"' - [ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support' - [ "${ZFS}" = '1' ] && print_warning 1 ' and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset' - [ "${ZFS}" = '1' ] && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.' - [ "${ZFS}" = '1' ] && print_warning 1 '"man genkernel" explains "dozfs" in detail.' - [ "${BTRFS}" = '1' ] && print_warning 1 'add "dobtrfs" for Btrfs device scanning support' - [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support' + isTrue "${SPLASH}" && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]" + isTrue "${LVM}" && print_warning 1 'add "dolvm" for LVM support' + isTrue "${DMRAID}" && print_warning 1 'add "dodmraid" for dmraid support' + isTrue "${MDADM}" && print_warning 1 'add "domdadm" for MDRAID support' + isTrue "${DMRAID}" && print_warning 1 ' or "dodmraid=<additional options>"' + isTrue "${ZFS}" && print_warning 1 'add "dozfs" for ZFS volume management support' + isTrue "${ZFS}" && print_warning 1 ' and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset' + isTrue "${ZFS}" && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.' + isTrue "${ZFS}" && print_warning 1 '"man genkernel" explains "dozfs" in detail.' + isTrue "${BTRFS}" && print_warning 1 'add "dobtrfs" for Btrfs device scanning support' + isTrue "${ISCSI}" && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support' if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then # Support --kernel-config=/proc/config.gz, mainly 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============
