ldconfig: Default to the new format for ld.so.cache

glibc has supported this format for close to 20 years.

diff --git a/NEWS b/NEWS
index 141078c31924367561cff42c04f9e110b3831065..10473bd514d6a35f575039d4d3d1496f3d0ae9c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,9 @@ Deprecated and removed features, and other changes affecting compatibility:
   Its implementation always returned with a failure, and the function
   was not declared in any header file.
 
+* ldconfig now defaults to the new format for ld.so.cache. glibc has
+  already supported this format for almost 20 years.
+
 Changes to build and runtime requirements:
 
 * powerpc64le requires GCC 7.4 or newer.  This is required for supporting

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 71178d416bc49a5c654bfb6d0c83a89697c08b2d..3b860ad732d1bfbe1af94355695623cf560899be 100644 (file)
--- 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 }
 };