diff -ur genkernel/gen_determineargs.sh genkernel.new/gen_determineargs.sh --- genkernel/gen_determineargs.sh 2014-12-10 13:23:25.247134189 -0600 +++ genkernel.new/gen_determineargs.sh 2014-12-10 13:32:45.782485131 -0600 @@ -2,7 +2,7 @@ # $Id: dc6b2c4d993280a079ed58f28c3b67b870c7e48e $ get_KV() { - if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ] + if isTrue ${KERNEL_SOURCES} && [ -e "${KERNCACHE}" ] then /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config if [ -e ${TEMP}/kerncache.config ] @@ -175,7 +175,7 @@ fi fi - if [ "${KERNEL_SOURCES}" != "0" ] + if isTrue "${KERNEL_SOURCES}" then if [ ! -d ${KERNEL_DIR} ] then @@ -185,11 +185,11 @@ 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 diff -ur genkernel/gen_funcs.sh genkernel.new/gen_funcs.sh --- genkernel/gen_funcs.sh 2014-12-10 13:23:25.600132507 -0600 +++ genkernel.new/gen_funcs.sh 2014-12-10 13:54:10.663339566 -0600 @@ -299,7 +299,7 @@ # 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}" ] @@ -345,7 +345,7 @@ # 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}" @@ -391,7 +391,7 @@ 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 -ur genkernel/gen_initramfs.sh genkernel.new/gen_initramfs.sh --- genkernel/gen_initramfs.sh 2014-12-10 13:23:25.557132712 -0600 +++ genkernel.new/gen_initramfs.sh 2014-12-10 14:33:21.644968914 -0600 @@ -179,7 +179,7 @@ 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 @@ -395,7 +395,7 @@ 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 @@ -807,7 +807,7 @@ append_data 'multipath' "${MULTIPATH}" append_data 'gpg' "${GPG}" - if [ "${RAMDISKMODULES}" = '1' ] + if isTrue "${RAMDISKMODULES}" then append_data 'modules' else diff -ur genkernel/genkernel genkernel.new/genkernel --- genkernel/genkernel 2014-12-10 13:23:25.249134180 -0600 +++ genkernel.new/genkernel 2014-12-10 13:59:34.707736435 -0600 @@ -237,12 +237,12 @@ compile_kernel # Compile modules - if [ "${BUILD_MODULES}" = '1' -a "${BUILD_STATIC}" = '0' ] + if [ "${BUILD_MODULES}" = '1' ] && 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 @@ -262,7 +262,7 @@ if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] then - [ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules + isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules gen_kerncache_extract_config fi @@ -301,7 +301,7 @@ if [ "${BUILD_RAMDISK}" = '1' ] then - if [ "${BUSYBOX}" = '1' ] + if isTrue "${BUSYBOX}" then # Compile Busybox compile_busybox @@ -363,14 +363,14 @@ 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="' - [ "${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=" to force booting from a specific dataset' - [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname= iscsi_target= and iscsi_address=" 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 RAID support' + isTrue "${DMRAID}" && print_warning 1 ' or "dodmraid="' + 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=" to force booting from a specific dataset' + isTrue "${ISCSI}" && print_warning 1 'add at least "iscsi_initiatorname= iscsi_target= and iscsi_address=" for iscsi support' if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then # Support --kernel-config=/proc/config.gz, mainly diff -ur genkernel/gen_moddeps.sh genkernel.new/gen_moddeps.sh --- genkernel/gen_moddeps.sh 2014-12-10 13:23:25.347133713 -0600 +++ genkernel.new/gen_moddeps.sh 2014-12-10 13:44:57.182031178 -0600 @@ -56,7 +56,7 @@ 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