sed: simpler fix for recent GNU compat stuff (by Rob Landley)

[oweals/busybox.git] / debianutils / Config.in

diff --git a/debianutils/Config.in b/debianutils/Config.in
index 399ccae6b01ffe1573437901bf03e10b9930dc00..9146f3ef47e2ec70365dd6057c95587893d1aa6f 100644 (file)
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -5,26 +5,19 @@
 
 menu "Debian Utilities"
 
-config CONFIG_MKTEMP
+config MKTEMP
        bool "mktemp"
        default n
        help
          mktemp is used to create unique temporary files
 
-config CONFIG_PIPE_PROGRESS
+config PIPE_PROGRESS
        bool "pipe_progress"
        default n
        help
          Display a dot to indicate pipe activity.
 
-config CONFIG_READLINK
-       bool "readlink"
-       default n
-       help
-         This program reads a symbolic link and returns the name
-         of the file it points to
-
-config CONFIG_RUN_PARTS
+config RUN_PARTS
        bool "run-parts"
        default n
        help
@@ -33,21 +26,54 @@ config CONFIG_RUN_PARTS
          It is useful to set up a directory like cron.daily, where you need to
          execute all the scripts in that directory.
 
-         In this implementation of run-parts some features (such as report mode) 
-         are not implemented.
+         In this implementation of run-parts some features (such as report
+         mode) are not implemented.
 
          Unless you know that run-parts is used in some of your scripts
          you can safely say N here.
 
-config CONFIG_START_STOP_DAEMON
+config FEATURE_RUN_PARTS_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on RUN_PARTS && LONG_OPTS
+       help
+         Support long options for the run-parts applet.
+
+config FEATURE_RUN_PARTS_FANCY
+       bool "Support additional arguments"
+       default n
+       depends on RUN_PARTS
+       help
+         Support additional options:
+         -l --list print the names of the all matching files (not
+                   limited to executables), but don't actually run them.
+
+config START_STOP_DAEMON
        bool "start-stop-daemon"
-       default y
+       default n
        help
          start-stop-daemon is used to control the creation and
          termination of system-level processes, usually the ones
          started during the startup of the system.
 
-config CONFIG_WHICH
+config FEATURE_START_STOP_DAEMON_FANCY
+       bool "Support additional arguments"
+       default n
+       depends on START_STOP_DAEMON
+       help
+         Support additional arguments.
+         -o|--oknodo ignored since we exit with 0 anyway
+         -v|--verbose
+         -N|--nicelevel N
+
+config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on START_STOP_DAEMON && LONG_OPTS
+       help
+         Support long options for the start-stop-daemon applet.
+
+config WHICH
        bool "which"
        default n
        help