From fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 22:48:33 +0100 Subject: [PATCH] Add /usr/bin/locale to the distribution. This is needed by vdradmin. Conflicts: config/rootfiles/core/68/filelists/files --- config/rootfiles/common/armv5tel/glibc | 2 +- config/rootfiles/common/i586/glibc | 2 +- config/rootfiles/core/68/filelists/files | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 42ae490ce2..28103897c0 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,7 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index ca62948a3a..d17d7dadd6 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -53,7 +53,7 @@ sbin/ldconfig #usr/bin/iconv usr/bin/ldd #usr/bin/lddlibc4 -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 46ea0b8392..65e46aecde 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -38,6 +38,7 @@ srv/web/ipfire/html/themes/maniac/include/style.css srv/web/ipfire/html/themes/maniac/include/upxlr.css srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/bin/locale usr/local/bin/consort.sh var/ipfire/backup/include var/ipfire/header.pl -- 2.39.2