Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: install locales-all instead of custom locales generation

Browse Source 
The custom way proved to be unreliable - for example does not survive
`locales` package upgrade. So settle on much more reliable way.

Fixes QubesOS/qubes-issues#1195
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-27 00:23:20 +01:00
parent 22365369d2
commit 9d52b7d178
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

@ -21,6 +21,7 @@ Depends:
librsvg2-bin, librsvg2-bin,
libvchan-xen, libvchan-xen,
locales, locales,
locales-all,
ncurses-term, ncurses-term,
net-tools, net-tools,
psmisc, psmisc,

9
debian/qubes-core-agent.postinst vendored
View File

@ -115,15 +115,6 @@ case "${1}" in
done done
dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
# make sure locale is really generated
current_locale=`grep 'LANG\|LC_ALL' /etc/default/locale|head -n 1|cut -f 2 -d =`
if [ -n "$current_locale" ] && ! locale -a | grep -q "$current_locale"; then
base=`echo "$current_locale" | cut -f 1 -d .`
charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .`
[ -n "$charmap" ] && charmap="-f $charmap"
localedef -i $base $charmap $current_locale
fi
# Remove old firmware updates link # Remove old firmware updates link
if [ -L /lib/firmware/updates ]; then if [ -L /lib/firmware/updates ]; then
rm -f /lib/firmware/updates rm -f /lib/firmware/updates