Added a compile time option to suppress the "Using fallback.." message

if no busybox.conf file is existant.

diff --git a/applets/applets.c b/applets/applets.c
index 1a274194036c3859aeec430c999e0fbf17881eb3..a6e6598cc8f73bd28fda27136cb35e41577c9cd2 100644 (file)
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -223,12 +223,14 @@ void check_suid ( struct BB_applet *applet )
                return;
        }
        else {
+#ifndef CONFIG_FEATURE_SUID_CONFIG_QUIET       
                static int onetime = 0;
                
                if ( !onetime ) {
                        onetime = 1;
                        fprintf ( stderr, "Using fallback suid method\n" );
                }
+#endif         
        }
 #endif
 

diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index adcc770898832c9bbaf0b008d73937b5f55eb619..d799c94eac75b70b9c5b40dc87f9292a297e3522 100644 (file)
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -20,6 +20,9 @@ bool 'Support for SUID/SGID handling'                                         CONFIG_FEATURE_SUID
 if [ "$CONFIG_FEATURE_SUID" = "y" ]; then
   bool '  Runtime configuration via /etc/busybox.conf'                 CONFIG_FEATURE_SUID_CONFIG
 fi
+if [ "$CONFIG_FEATURE_SUID_CONFIG" = "y" ]; then
+  bool '    Suppress message if config file is not readable'                   CONFIG_FEATURE_SUID_CONFIG_QUIET
+fi
 endmenu
 
 source archival/config.in