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

diff --git a/genkernel b/genkernel
index 98f24d9a097cd006cd1a6b91577392259b90a2e2..7584ad9beacc37083f868dabbc3f25b031ba1fe3 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -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"

diff --git a/genkernel.conf b/genkernel.conf
index 331dbc1860d18310d133931bbb566ad7029b7cb0..5d93a66b389305451b56274d2d40cc26ad9b8be3 100644 (file)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -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============