diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-10-04 12:52:36 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-10-04 12:53:09 -0400 |
commit | 0a03ba76be8a59a6869dc4cd573c0760fa765a10 (patch) | |
tree | bd6ca4e99629d339fce86e07c6c27a819194ad84 /standalone | |
parent | 5d91a09bb3b61e0cff3dca1f0f9168803c01ea76 (diff) |
Linux standalone: Add back the LOCPATH=/dev/null hack to avoid the system locale-archive being read.
Version mismatches between the system locale-archive and the glibc in the
bundle have been observed to cause git crashes.
Unfortunately, this causes locales to not be used in the linux standalone
bundle, as was the case until version 6.20160419.
glibc hardcodes the path to /usr/lib/locale/locale-archive and does not
let an environment variable cause a different locale-archive file to be used.
The only other option to include locales in the bundle would be to include
exploded locale definition directories in the bundle for a number of
locales, generated by localedef. But these take at least 300 kb per locale,
and there are a great many locales; it would be hundreds of megabytes to
include them all.
(Hmm, we could include localdef in the bundle, and check LANG in runshell
and compile the locale directories on the fly. This would need
/usr/share/i18n/ and /usr/lib/locale-archive to be included in the bundle.
It's.. doable.)
I know this is going to once again cause users of the bundle to complain
that eg, ls doesn't show their unicode filenames right. Better than strange
crashes though.
Diffstat (limited to 'standalone')
-rwxr-xr-x | standalone/linux/skel/runshell | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/standalone/linux/skel/runshell b/standalone/linux/skel/runshell index 874dc75f1..d15aacbc8 100755 --- a/standalone/linux/skel/runshell +++ b/standalone/linux/skel/runshell @@ -100,6 +100,11 @@ export ORIG_GCONV_PATH GCONV_PATH="$base/$(cat "$base/gconvdir")" export GCONV_PATH +ORIG_LOCPATH="$LOCPATH" +export ORIG_LOCPATH +LOCPATH=/dev/null +export LOCPATH + ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" export ORIG_GIT_EXEC_PATH GIT_EXEC_PATH="$base/git-core" |