Sync with 20030104-2 cvs package, disable fdisk BSD label as they dont

compile on m68k

1 files changed, 36 insertions, 4 deletions

diff --git a/debian/config-udeb b/debian/config-udeb
index 2f5917053..ccf57207e 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -245,17 +245,45 @@ CONFIG_PS=y
 #
 # Another Bourne-like Shell
 #
-# CONFIG_FEATURE_SH_IS_ASH is not set
+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=y
-# CONFIG_ASH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# ash (forced enabled as default shell)
+#
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
 
 #
+# Bourne Shell Options
+#
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
+# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
 # Shell Utilities
 #
 CONFIG_BASENAME=y
@@ -278,6 +306,10 @@ CONFIG_REALPATH=y
 # CONFIG_TEE is not set
 CONFIG_TRUE=y
 CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
 # CONFIG_USLEEP is not set
@@ -300,7 +332,7 @@ CONFIG_SYSLOGD=y
 #
 CONFIG_CAT=y
 # CONFIG_CMP is not set
-# CONFIG_CUT is not set
+CONFIG_CUT=y
 # CONFIG_DOS2UNIX is not set
 CONFIG_HEAD=y
 # CONFIG_LENGTH is not set