about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2020-05-19 14:41:48 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-05-19 14:41:48 +0200
commitcad64f778aced84efdaa04ae64f8737b86f063ab (patch)
treea05908dd2baf169bdcc7f4de847312a13e650f5a /elf
parent790b8dda4455865cb8c3a47801f4304c1a43baf6 (diff)
downloadglibc-cad64f778aced84efdaa04ae64f8737b86f063ab.tar.gz
glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.tar.xz
glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.zip
ldconfig: Default to the new format for ld.so.cache
glibc has supported this format for close to 20 years.
Diffstat (limited to 'elf')
-rw-r--r--elf/ldconfig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 71178d416b..3b860ad732 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -97,7 +97,7 @@ int opt_verbose;
 
 /* Format to support.  */
 /* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2.  */
-int opt_format = 1;
+int opt_format = 2;
 
 /* Build cache.  */
 static int opt_build_cache = 1;
@@ -150,7 +150,7 @@ static const struct argp_option options[] =
   { NULL, 'f', N_("CONF"), 0, N_("Use CONF as configuration file"), 0},
   { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line.  Don't build cache."), 0},
   { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0},
-  { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0},
+  { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new (default), old, or compat"), 0},
   { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0},
   { NULL, 0, NULL, 0, NULL, 0 }
 };