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