From 40efdee49c6ea28cebeae872556f531f24480978 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 7 Dec 2008 14:55:23 -0600 Subject: [PATCH] Enable CONFIG_FEATURE_PREFER_APPLETS busybox option export PATH at top of netboot linuxrc --- ChangeLog | 8 ++++++++ arch/alpha/busy-config | 2 +- arch/ia64/busy-config | 2 +- arch/mips/busy-config | 2 +- arch/parisc/busy-config | 2 +- arch/parisc64/busy-config | 2 +- arch/ppc/busy-config | 2 +- arch/ppc64/busy-config | 2 +- arch/sparc/busy-config | 2 +- arch/sparc64/busy-config | 2 +- arch/x86/busy-config | 2 +- arch/x86_64/busy-config | 2 +- defaults/busy-config | 2 +- netboot/linuxrc.x | 10 ++++------ 14 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3be0db1..9255d41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 07 Dec 2008; Andrew Gaffney arch/alpha/busy-config, + arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config, + arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config, + arch/sparc/busy-config, arch/sparc64/busy-config, arch/x86/busy-config, + arch/x86_64/busy-config, defaults/busy-config, netboot/linuxrc.x: + Enable CONFIG_FEATURE_PREFER_APPLETS busybox option export PATH at top of + netboot linuxrc + 07 Dec 2008; Andrew Gaffney gen_initramfs.sh, netboot/linuxrc.x: Move all netboot logic from catalyst into gk diff --git a/arch/alpha/busy-config b/arch/alpha/busy-config index 2a20b28..5a48f78 100644 --- a/arch/alpha/busy-config +++ b/arch/alpha/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/ia64/busy-config b/arch/ia64/busy-config index 2a20b28..5a48f78 100644 --- a/arch/ia64/busy-config +++ b/arch/ia64/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/mips/busy-config b/arch/mips/busy-config index 2a20b28..5a48f78 100644 --- a/arch/mips/busy-config +++ b/arch/mips/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/parisc/busy-config b/arch/parisc/busy-config index 2a20b28..5a48f78 100644 --- a/arch/parisc/busy-config +++ b/arch/parisc/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/parisc64/busy-config b/arch/parisc64/busy-config index 2a20b28..5a48f78 100644 --- a/arch/parisc64/busy-config +++ b/arch/parisc64/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/ppc/busy-config b/arch/ppc/busy-config index 2a20b28..5a48f78 100644 --- a/arch/ppc/busy-config +++ b/arch/ppc/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/ppc64/busy-config b/arch/ppc64/busy-config index 2a20b28..5a48f78 100644 --- a/arch/ppc64/busy-config +++ b/arch/ppc64/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/sparc/busy-config b/arch/sparc/busy-config index 2a20b28..5a48f78 100644 --- a/arch/sparc/busy-config +++ b/arch/sparc/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/sparc64/busy-config b/arch/sparc64/busy-config index 2a20b28..5a48f78 100644 --- a/arch/sparc64/busy-config +++ b/arch/sparc64/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/x86/busy-config b/arch/x86/busy-config index 2a20b28..5a48f78 100644 --- a/arch/x86/busy-config +++ b/arch/x86/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/arch/x86_64/busy-config b/arch/x86_64/busy-config index 2a20b28..5a48f78 100644 --- a/arch/x86_64/busy-config +++ b/arch/x86_64/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/defaults/busy-config b/defaults/busy-config index 2a20b28..5a48f78 100644 --- a/defaults/busy-config +++ b/defaults/busy-config @@ -30,7 +30,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y diff --git a/netboot/linuxrc.x b/netboot/linuxrc.x index 87d04b9..5285fa5 100644 --- a/netboot/linuxrc.x +++ b/netboot/linuxrc.x @@ -3,14 +3,12 @@ # Copyright 2001-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later - +export PATH="/usr/sbin:/usr/bin:/sbin:/bin" #// Path, basic vars #//-------------------------------------------------------------------------------- BasicSetup() { - export PATH=/usr/sbin:/usr/bin:/sbin:/bin - #// Copyright year, Build date in YYYYMMDD format, and in MMDDYYYY to make busybox 'date' happy MYDATE="`cat /etc/build_date`" CPYYEAR="$(echo ${MYDATE} | cut -c 1-4)" @@ -27,9 +25,9 @@ BasicSetup() { StartUp() { if [ ! -f "/tmp/.startup" ]; then #// Mount proc && sys - /bin/mount proc /proc -t proc # /proc - /bin/mount sys /sys -t sysfs # /sys - /bin/mount mdev /dev -t tmpfs -o size=800k # /dev for mdev + mount proc /proc -t proc # /proc + mount sys /sys -t sysfs # /sys + mount mdev /dev -t tmpfs -o size=800k # /dev for mdev #// Let busybox build its applets /bin/busybox --install -s -- 2.26.2