From: Peter Hjalmarsson <xake@rymdraket.net> Date: Sun, 12 Aug 2012 22:05:01 +0000 (+0200) Subject: Move the sourcing of software.sh to genkernel X-Git-Tag: v3.4.41~2^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cc3cceb029f8b0162893afc32c415c278b6b342;p=genkernel.git 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 98f24d9..7584ad9 100755 --- 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 331dbc1..5d93a66 100644 --- 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============