e354a5
commit cad64f778aced84efdaa04ae64f8737b86f063ab
e354a5
Author: Josh Triplett <josh@joshtriplett.org>
e354a5
Date:   Tue May 19 14:41:48 2020 +0200
e354a5
e354a5
    ldconfig: Default to the new format for ld.so.cache
e354a5
    
e354a5
    glibc has supported this format for close to 20 years.
e354a5
e354a5
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
e354a5
index 5e6516688a1c192a..f31e10817dd5d665 100644
e354a5
--- a/elf/ldconfig.c
e354a5
+++ b/elf/ldconfig.c
e354a5
@@ -97,7 +97,7 @@ int opt_verbose;
e354a5
 
e354a5
 /* Format to support.  */
e354a5
 /* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2.  */
e354a5
-int opt_format = 1;
e354a5
+int opt_format = 2;
e354a5
 
e354a5
 /* Build cache.  */
e354a5
 static int opt_build_cache = 1;
e354a5
@@ -150,7 +150,7 @@ static const struct argp_option options[] =
e354a5
   { NULL, 'f', N_("CONF"), 0, N_("Use CONF as configuration file"), 0},
e354a5
   { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line.  Don't build cache."), 0},
e354a5
   { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0},
e354a5
-  { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0},
e354a5
+  { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new (default), old, or compat"), 0},
e354a5
   { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0},
e354a5
   { NULL, 0, NULL, 0, NULL, 0 }
e354a5
 };