Cleanup some config problems. Add a sane default config that basically
matches the default old Config.h
This commit is contained in:
Eric Andersen
parent
30fcef430c
commit
282671bf76
@ -18,10 +18,10 @@ if [ "$CONFIG_INIT" = "y" ]; then
|
||||
bool 'halt' CONFIG_HALT
|
||||
bool 'poweroff' CONFIG_POWEROFF
|
||||
bool 'reboot' CONFIG_REBOOT
|
||||
bool 'start-stop-daemon' CONFIG_START_STOP_DAEMON
|
||||
fi
|
||||
|
||||
bool 'run-parts' CONFIG_RUN_PARTS
|
||||
bool 'start-stop-daemon' CONFIG_START_STOP_DAEMON
|
||||
bool 'run-parts' CONFIG_RUN_PARTS
|
||||
|
||||
endmenu
|
||||
|
||||
|
||||
@ -1161,12 +1161,14 @@ set_geometry () {
|
||||
set_geometry `stty size 2>/dev/null`
|
||||
|
||||
menu_instructions="\
|
||||
Enabling options will increase the size of busybox. \
|
||||
Arrow keys navigate the menu. \
|
||||
Pressing <Enter> selects submenus --->. \
|
||||
Highlighted letters are hotkeys. \
|
||||
Pressing <Y> includes, and <N> excludes. \
|
||||
Press <Esc><Esc> to exit, <?> for Help. \
|
||||
Legend: [*] built-in [ ] excluded "
|
||||
Legend: [*] built-in [ ] excluded"
|
||||
|
||||
|
||||
radiolist_instructions="\
|
||||
Use the arrow keys to navigate this window or \
|
||||
|
||||
@ -15,24 +15,28 @@ choice 'Choose your default shell' \
|
||||
|
||||
if [ "$CONFIG_FEATURE_SH_IS_ASH" = "y" ] ; then
|
||||
define_bool CONFIG_ASH y
|
||||
comment 'ash'
|
||||
else
|
||||
bool 'ash' CONFIG_ASH
|
||||
fi
|
||||
|
||||
if [ "$CONFIG_FEATURE_SH_IS_HUSH" = "y" ] ; then
|
||||
define_bool CONFIG_HUSH y
|
||||
comment 'hush'
|
||||
else
|
||||
bool 'hush' CONFIG_HUSH
|
||||
fi
|
||||
|
||||
if [ "$CONFIG_FEATURE_SH_IS_LASH" = "y" ] ; then
|
||||
define_bool CONFIG_LASH y
|
||||
comment 'lash'
|
||||
else
|
||||
bool 'lash' CONFIG_LASH
|
||||
fi
|
||||
|
||||
if [ "$CONFIG_FEATURE_SH_IS_MSH" = "y" ] ; then
|
||||
define_bool CONFIG_MSH y
|
||||
comment 'msh'
|
||||
else
|
||||
bool 'msh' CONFIG_MSH
|
||||
fi
|
||||
|
||||
@ -6,16 +6,15 @@ mainmenu_name "BusyBox Configuration"
|
||||
|
||||
mainmenu_option next_comment
|
||||
comment 'BusyBox general settings'
|
||||
bool 'Show verbose applet usage messages (increases size)' CONFIG_FEATURE_VERBOSE_USAGE
|
||||
bool 'Support --install [-s] to install applet links at runtime' CONFIG_FEATURE_INSTALLER
|
||||
bool 'Enable locale support (system needs locale for this to work)' CONFIG_LOCALE_SUPPORT
|
||||
bool 'Support for devfs' CONFIG_FEATURE_DEVFS
|
||||
bool 'Clean up all memory before exiting (usually not needed)' CONFIG_FEATURE_CLEAN_UP
|
||||
choice 'Buffer allocation policy' \
|
||||
"use_malloc CONFIG_FEATURE_BUFFERS_USE_MALLOC \
|
||||
on_stack CONFIG_FEATURE_BUFFERS_GO_ON_STACK \
|
||||
in_bss CONFIG_FEATURE_BUFFERS_GO_IN_BSS" use_malloc
|
||||
|
||||
bool 'Show verbose applet usage messages' CONFIG_FEATURE_VERBOSE_USAGE
|
||||
bool 'Support --install [-s] to install applet links at runtime' CONFIG_FEATURE_INSTALLER
|
||||
bool 'Enable locale support (system needs locale for this to work)' CONFIG_LOCALE_SUPPORT
|
||||
bool 'Support for devfs' CONFIG_FEATURE_DEVFS
|
||||
bool 'Clean up all memory before exiting (usually not needed)' CONFIG_FEATURE_CLEAN_UP
|
||||
endmenu
|
||||
|
||||
source archival/config.in
|
||||
|
||||
@ -0,0 +1,289 @@
|
||||
#
|
||||
# Automatically generated by make menuconfig: don't edit
|
||||
#
|
||||
|
||||
#
|
||||
# BusyBox general settings
|
||||
#
|
||||
# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
|
||||
CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
|
||||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
# CONFIG_FEATURE_VERBOSE_USAGE is not set
|
||||
# CONFIG_FEATURE_INSTALLER is not set
|
||||
# CONFIG_LOCALE_SUPPORT is not set
|
||||
# CONFIG_FEATURE_DEVFS is not set
|
||||
# CONFIG_FEATURE_CLEAN_UP is not set
|
||||
|
||||
#
|
||||
# Archival Utilities
|
||||
#
|
||||
# CONFIG_AR is not set
|
||||
# CONFIG_BUNZIP2 is not set
|
||||
# CONFIG_CPIO is not set
|
||||
# CONFIG_DPKG is not set
|
||||
# CONFIG_DPKG_DEB is not set
|
||||
CONFIG_GUNZIP=y
|
||||
CONFIG_GZIP=y
|
||||
# CONFIG_RPM2CPIO is not set
|
||||
CONFIG_TAR=y
|
||||
CONFIG_FEATURE_TAR_CREATE=y
|
||||
# CONFIG_FEATURE_TAR_EXCLUDE is not set
|
||||
CONFIG_FEATURE_TAR_GZIP=y
|
||||
|
||||
#
|
||||
# Console Utilities
|
||||
#
|
||||
# CONFIG_CHVT is not set
|
||||
CONFIG_CLEAR=y
|
||||
# CONFIG_DEALLOCVT is not set
|
||||
# CONFIG_DUMPKMAP is not set
|
||||
# CONFIG_LOADACM is not set
|
||||
# CONFIG_LOADFONT is not set
|
||||
# CONFIG_LOADKMAP is not set
|
||||
CONFIG_RESET=y
|
||||
# CONFIG_SETKEYCODES is not set
|
||||
|
||||
#
|
||||
# Editors
|
||||
#
|
||||
CONFIG_SED=y
|
||||
CONFIG_VI=y
|
||||
CONFIG_FEATURE_VI_COLON=y
|
||||
CONFIG_FEATURE_VI_YANKMARK=y
|
||||
CONFIG_FEATURE_VI_SEARCH=y
|
||||
CONFIG_FEATURE_VI_USE_SIGNALS=y
|
||||
CONFIG_FEATURE_VI_DOT_CMD=y
|
||||
CONFIG_FEATURE_VI_READONLY=y
|
||||
CONFIG_FEATURE_VI_SETOPTS=y
|
||||
CONFIG_FEATURE_VI_SET=y
|
||||
CONFIG_FEATURE_VI_WIN_RESIZE=y
|
||||
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
|
||||
|
||||
#
|
||||
# File Utilities
|
||||
#
|
||||
CONFIG_CHMOD=y
|
||||
CONFIG_CHOWN=y
|
||||
CONFIG_CHGRP=y
|
||||
CONFIG_CP=y
|
||||
CONFIG_DD=y
|
||||
CONFIG_DF=y
|
||||
CONFIG_DU=y
|
||||
CONFIG_LN=y
|
||||
CONFIG_LS=y
|
||||
CONFIG_FEATURE_LS_FILETYPES=y
|
||||
CONFIG_FEATURE_LS_FOLLOWLINKS=y
|
||||
# CONFIG_FEATURE_LS_RECURSIVE is not set
|
||||
CONFIG_FEATURE_LS_SORTFILES=y
|
||||
CONFIG_FEATURE_LS_TIMESTAMPS=y
|
||||
CONFIG_FEATURE_LS_USERNAME=y
|
||||
CONFIG_MKDIR=y
|
||||
# CONFIG_MKFIFO is not set
|
||||
CONFIG_MKNOD=y
|
||||
CONFIG_MV=y
|
||||
CONFIG_RM=y
|
||||
CONFIG_RMDIR=y
|
||||
CONFIG_SYNC=y
|
||||
CONFIG_TOUCH=y
|
||||
CONFIG_FEATURE_AUTOWIDTH=y
|
||||
CONFIG_FEATURE_HUMAN_READABLE=y
|
||||
|
||||
#
|
||||
# Finding Utilities
|
||||
#
|
||||
CONFIG_FIND=y
|
||||
# CONFIG_FEATURE_FIND_MTIME is not set
|
||||
# CONFIG_FEATURE_FIND_PERM is not set
|
||||
CONFIG_FEATURE_FIND_TYPE=y
|
||||
CONFIG_GREP=y
|
||||
# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
|
||||
# CONFIG_FEATURE_GREP_CONTEXT is not set
|
||||
CONFIG_WHICH=y
|
||||
# CONFIG_XARGS is not set
|
||||
|
||||
#
|
||||
# Init Utilities
|
||||
#
|
||||
CONFIG_INIT=y
|
||||
CONFIG_FEATURE_USE_INITTAB=y
|
||||
CONFIG_FEATURE_INITRD=y
|
||||
CONFIG_FEATURE_INIT_COREDUMPS=y
|
||||
CONFIG_FEATURE_EXTRA_QUIET=y
|
||||
CONFIG_HALT=y
|
||||
CONFIG_POWEROFF=y
|
||||
CONFIG_REBOOT=y
|
||||
# CONFIG_START_STOP_DAEMON is not set
|
||||
# CONFIG_RUN_PARTS is not set
|
||||
|
||||
#
|
||||
# Miscellaneous Utilities
|
||||
#
|
||||
# CONFIG_ADJTIMEX is not set
|
||||
# CONFIG_DC is not set
|
||||
# CONFIG_DUTMP is not set
|
||||
# CONFIG_MAKEDEVS is not set
|
||||
# CONFIG_MKTEMP is not set
|
||||
# CONFIG_MT is not set
|
||||
# CONFIG_READLINK is not set
|
||||
# CONFIG_UPDATE is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
# Module Utilities
|
||||
#
|
||||
CONFIG_INSMOD=y
|
||||
CONFIG_LSMOD=y
|
||||
CONFIG_MODPROBE=y
|
||||
CONFIG_RMMOD=y
|
||||
CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
|
||||
# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
|
||||
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
|
||||
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
|
||||
|
||||
#
|
||||
# Networking Utilities
|
||||
#
|
||||
CONFIG_HOSTNAME=y
|
||||
CONFIG_IFCONFIG=y
|
||||
CONFIG_FEATURE_IFCONFIG_STATUS=y
|
||||
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
|
||||
# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
|
||||
CONFIG_FEATURE_IFCONFIG_HW=y
|
||||
# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
|
||||
# CONFIG_NC is not set
|
||||
# CONFIG_NETSTAT is not set
|
||||
CONFIG_NSLOOKUP=y
|
||||
CONFIG_PING=y
|
||||
CONFIG_FEATURE_FANCY_PING=y
|
||||
CONFIG_ROUTE=y
|
||||
# CONFIG_TELNET is not set
|
||||
# CONFIG_TFTP is not set
|
||||
# CONFIG_TRACEROUTE is not set
|
||||
# CONFIG_WGET is not set
|
||||
|
||||
#
|
||||
# Login/Password Management Utilities
|
||||
#
|
||||
# CONFIG_USE_BB_PWD_GRP is not set
|
||||
# CONFIG_ADDGROUP is not set
|
||||
# CONFIG_ADDUSER is not set
|
||||
# CONFIG_DELUSER is not set
|
||||
# CONFIG_DELUSER is not set
|
||||
# CONFIG_GETTY is not set
|
||||
|
||||
#
|
||||
# Process Utilities
|
||||
#
|
||||
CONFIG_FREE=y
|
||||
CONFIG_KILL=y
|
||||
CONFIG_KILLALL=y
|
||||
# CONFIG_PIDOF is not set
|
||||
CONFIG_PS=y
|
||||
# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
|
||||
# CONFIG_RENICE is not set
|
||||
CONFIG_UPTIME=y
|
||||
|
||||
#
|
||||
# Bourne Shell
|
||||
#
|
||||
CONFIG_FEATURE_SH_IS_ASH=y
|
||||
# CONFIG_FEATURE_SH_IS_HUSH is not set
|
||||
# CONFIG_FEATURE_SH_IS_LASH is not set
|
||||
# CONFIG_FEATURE_SH_IS_MSH is not set
|
||||
# CONFIG_FEATURE_SH_IS_NONE is not set
|
||||
CONFIG_ASH=y
|
||||
# CONFIG_HUSH is not set
|
||||
# CONFIG_LASH is not set
|
||||
# CONFIG_MSH is not set
|
||||
CONFIG_FEATURE_COMMAND_EDITING=y
|
||||
CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
|
||||
CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
|
||||
CONFIG_FEATURE_SH_STANDALONE_SHELL=y
|
||||
CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN=y
|
||||
CONFIG_FEATURE_SH_FANCY_PROMPT=y
|
||||
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
|
||||
|
||||
#
|
||||
# Shell Utilities
|
||||
#
|
||||
CONFIG_BASENAME=y
|
||||
CONFIG_CHROOT=y
|
||||
CONFIG_DATE=y
|
||||
CONFIG_DIRNAME=y
|
||||
CONFIG_ECHO=y
|
||||
CONFIG_ENV=y
|
||||
# CONFIG_EXPR is not set
|
||||
CONFIG_FALSE=y
|
||||
# CONFIG_HOSTID is not set
|
||||
CONFIG_ID=y
|
||||
# CONFIG_LOGNAME is not set
|
||||
# CONFIG_PRINTF is not set
|
||||
CONFIG_PWD=y
|
||||
CONFIG_SLEEP=y
|
||||
# CONFIG_STTY is not set
|
||||
# CONFIG_TEE is not set
|
||||
CONFIG_TEST=y
|
||||
CONFIG_TRUE=y
|
||||
CONFIG_TTY=y
|
||||
CONFIG_UNAME=y
|
||||
# CONFIG_USLEEP is not set
|
||||
CONFIG_WHOAMI=y
|
||||
CONFIG_YES=y
|
||||
|
||||
#
|
||||
# System Logging Utilities
|
||||
#
|
||||
CONFIG_KLOGD=y
|
||||
CONFIG_LOGGER=y
|
||||
CONFIG_SYSLOGD=y
|
||||
# CONFIG_FEATURE_REMOTE_LOG is not set
|
||||
# CONFIG_FEATURE_IPC_SYSLOG is not set
|
||||
|
||||
#
|
||||
# Text Utilities
|
||||
#
|
||||
CONFIG_CAT=y
|
||||
# CONFIG_CMP is not set
|
||||
CONFIG_CUT=y
|
||||
# CONFIG_DOS2UNIX is not set
|
||||
CONFIG_HEAD=y
|
||||
# CONFIG_LENGTH is not set
|
||||
# CONFIG_MD5SUM is not set
|
||||
# CONFIG_OD is not set
|
||||
CONFIG_SORT=y
|
||||
# CONFIG_FEATURE_SORT_REVERSE is not set
|
||||
# CONFIG_FEATURE_SORT_UNIQUE is not set
|
||||
CONFIG_TAIL=y
|
||||
# CONFIG_FEATURE_FANCY_TAIL is not set
|
||||
# CONFIG_TR is not set
|
||||
CONFIG_UNIQ=y
|
||||
# CONFIG_DOS2UNIX is not set
|
||||
# CONFIG_UUDECODE is not set
|
||||
# CONFIG_UUENCODE is not set
|
||||
# CONFIG_WC is not set
|
||||
|
||||
#
|
||||
# Linux System Utilities
|
||||
#
|
||||
CONFIG_DMESG=y
|
||||
# CONFIG_FBSET is not set
|
||||
# CONFIG_FDFLUSH is not set
|
||||
# CONFIG_FREERAMDISK is not set
|
||||
# CONFIG_FSCK_MINIX is not set
|
||||
# CONFIG_MKFS_MINIX is not set
|
||||
# CONFIG_GETOPT is not set
|
||||
# CONFIG_HEXDUMP is not set
|
||||
# CONFIG_MKSWAP is not set
|
||||
CONFIG_MORE=y
|
||||
CONFIG_FEATURE_USE_TERMIOS=y
|
||||
CONFIG_FEATURE_AUTOWIDTH=y
|
||||
# CONFIG_PIVOT_ROOT is not set
|
||||
# CONFIG_RDATE is not set
|
||||
# CONFIG_SWAPONOFF is not set
|
||||
CONFIG_MOUNT=y
|
||||
# CONFIG_NFSMOUNT is not set
|
||||
# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
|
||||
CONFIG_UMOUNT=y
|
||||
# CONFIG_FEATURE_MOUNT_FORCE is not set
|
||||
# CONFIG_FEATURE_MOUNT_LOOP is not set
|
||||
# CONFIG_FEATURE_MTAB_SUPPORT is not set
|
||||
@ -28,10 +28,13 @@ bool 'more' CONFIG_MORE
|
||||
if [ "$CONFIG_MORE" = "y" ]; then
|
||||
bool ' Use termios to manipulate the screen' CONFIG_FEATURE_USE_TERMIOS
|
||||
fi
|
||||
if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y"]; then
|
||||
if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y" ]; then
|
||||
comment ' Common options for ls and more'
|
||||
bool ' Calculate terminal & column widths' CONFIG_FEATURE_AUTOWIDTH
|
||||
fi
|
||||
bool 'pivot_root' CONFIG_PIVOT_ROOT
|
||||
bool 'rdate' CONFIG_RDATE
|
||||
bool 'swaponoff' CONFIG_SWAPONOFF
|
||||
bool 'mount' CONFIG_MOUNT
|
||||
if [ "$CONFIG_MOUNT" = "y" ]; then
|
||||
bool ' Support mounting nfs file systems' CONFIG_NFSMOUNT
|
||||
@ -46,9 +49,6 @@ if [ "$CONFIG_MOUNT" = "y" -o "$CONFIG_UMOUNT" = "y" ]; then
|
||||
bool ' Support for loop devices' CONFIG_FEATURE_MOUNT_LOOP
|
||||
bool ' Support for a real /etc/mtab (instead of /proc/mounts)' CONFIG_FEATURE_MTAB_SUPPORT
|
||||
fi
|
||||
bool 'pivot_root' CONFIG_PIVOT_ROOT
|
||||
bool 'rdate' CONFIG_RDATE
|
||||
bool 'swaponoff' CONFIG_SWAPONOFF
|
||||
|
||||
endmenu
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user