Move the sourcing of software.sh to genkernel

This way there is no fear of users accidental removing
the source-line from genkernel.conf, ending up with a broken genkernel
cleanup-cruft
Peter Hjalmarsson 13 years ago
parent ec6b2536d8
commit 0cc3cceb02

@ -37,6 +37,7 @@ _GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf}
source "${_GENKERNEL_CONF}" || small_die "Could not read ${_GENKERNEL_CONF}"
# Start sourcing other scripts
source ${GK_SHARE}/defaults/software.sh || small_die "Could not read ${GK_SHARE}/defaults/software.sh"
source ${GK_SHARE}/gen_funcs.sh || small_die "Could not read ${GK_SHARE}/gen_funcs.sh"
source ${GK_SHARE}/gen_cmdline.sh || gen_die "Could not read ${GK_SHARE}/gen_cmdline.sh"
source ${GK_SHARE}/gen_arch.sh || gen_die "Could not read ${GK_SHARE}/gen_arch.sh"

@ -203,9 +203,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
# 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
# below the source command.
source "${GK_SHARE}/defaults/software.sh"
# You can still override these settings in here.
# =========MISC KERNEL CONFIGURATION============

Loading…
Cancel
Save