diff --git a/Dockerfile.template b/Dockerfile.template index a25e5e6..f4f03db 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -26,5 +26,5 @@ COPY --from=verify /rootfs/ / RUN ldconfig && \ sed -i '/BUILD_ID/a VERSION_ID=TEMPLATE_VERSION_ID' /etc/os-release -ENV LANG=en_US.UTF-8 +ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Makefile b/Makefile index 45928bc..5e86662 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ define rootfs cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/ fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust - fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"' ln -fs /usr/lib/os-release $(BUILDDIR)/etc/os-release diff --git a/pacman-conf.d-noextract.conf b/pacman-conf.d-noextract.conf index 76b762b..a450c93 100644 --- a/pacman-conf.d-noextract.conf +++ b/pacman-conf.d-noextract.conf @@ -1,9 +1,10 @@ [options] -NoExtract = usr/share/help/* !usr/share/help/en* +NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/* NoExtract = usr/share/gtk-doc/html/* usr/share/doc/* NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/* NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.* NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso* NoExtract = !usr/share/*locales/trans* +NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz NoExtract = usr/share/man/* usr/share/info/* NoExtract = usr/share/vim/vim*/lang/* diff --git a/rootfs/etc/locale.conf b/rootfs/etc/locale.conf index 01ec548..f9c983c 100644 --- a/rootfs/etc/locale.conf +++ b/rootfs/etc/locale.conf @@ -1 +1 @@ -LANG=en_US.UTF-8 +LANG=C.UTF-8 diff --git a/rootfs/etc/locale.gen b/rootfs/etc/locale.gen deleted file mode 100644 index a66d814..0000000 --- a/rootfs/etc/locale.gen +++ /dev/null @@ -1 +0,0 @@ -en_US.UTF-8 UTF-8