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 c49197666ae896824287dd0a6938b6c15e694cb6..9146f3ef47e2ec70365dd6057c95587893d1aa6f 100644 (file)
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -17,20 +17,6 @@ config PIPE_PROGRESS
        help
          Display a dot to indicate pipe activity.
 
-config READLINK
-       bool "readlink"
-       default n
-       help
-         This program reads a symbolic link and returns the name
-         of the file it points to
-
-config FEATURE_READLINK_FOLLOW
-       bool "Enable canonicalization by following all symlinks (-f)"
-       default n
-       depends on READLINK
-       help
-         Enable the readlink option (-f).
-
 config RUN_PARTS
        bool "run-parts"
        default n
@@ -40,8 +26,8 @@ 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.
@@ -49,7 +35,7 @@ config RUN_PARTS
 config FEATURE_RUN_PARTS_LONG_OPTIONS
        bool "Enable long options"
        default n
-       depends on RUN_PARTS && GETOPT_LONG
+       depends on RUN_PARTS && LONG_OPTS
        help
          Support long options for the run-parts applet.
 
@@ -64,7 +50,7 @@ config FEATURE_RUN_PARTS_FANCY
 
 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
@@ -72,17 +58,18 @@ config START_STOP_DAEMON
 
 config FEATURE_START_STOP_DAEMON_FANCY
        bool "Support additional arguments"
-       default y
+       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 && GETOPT_LONG
+       depends on START_STOP_DAEMON && LONG_OPTS
        help
          Support long options for the start-stop-daemon applet.