diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2008-12-15 20:31:51 -0600 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2008-12-15 20:31:51 -0600 |
| commit | 96518cfede78cc7d9c6d0c00ab20f4801de6bf9e (patch) | |
| tree | fe856ffe813fa215c3335b55120cf97be55c663f /gen_compile.sh | |
| parent | Use : as a regex separator instead of / since REAL_ROOT will have / in it (diff) | |
| download | genkernel-96518cfede78cc7d9c6d0c00ab20f4801de6bf9e.tar.gz genkernel-96518cfede78cc7d9c6d0c00ab20f4801de6bf9e.tar.bz2 genkernel-96518cfede78cc7d9c6d0c00ab20f4801de6bf9e.zip | |
Separate out main and netboot busy-config
Diffstat (limited to 'gen_compile.sh')
| -rw-r--r-- | gen_compile.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gen_compile.sh b/gen_compile.sh index faf40763..1136d3d7 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -335,6 +335,12 @@ compile_busybox() { then [ -f "${BUSYBOX_CONFIG}" ] || gen_die "Could not find busybox config file: ${BUSYBOX_CONFIG}" + elif isTrue "${NETBOOT}" && [ -f "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")" ] + then + BUSYBOX_CONFIG="$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")" + elif isTrue "${NETBOOT}" && [ -f "${GK_SHARE}/netboot/busy-config" ] + then + BUSYBOX_CONFIG="${GK_SHARE}/netboot/busy-config" elif [ -f "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")" ] then BUSYBOX_CONFIG="$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")" @@ -342,7 +348,7 @@ compile_busybox() { then BUSYBOX_CONFIG="${GK_SHARE}/defaults/busy-config" else - gendie "Could not find a busybox config file" + gen_die "Could not find a busybox config file" fi # Delete cache if stored config's MD5 does not match one to be used |