Bug#697650: live-config: locales boot params accepting short modes
Package: live-config
Version: 3.0.15-1
Followup-For: Bug #697650
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Sorry, the previous patch was wrong, this new one is confirmed that
works
- -- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages live-config depends on:
ii live-config-sysvinit [live-config-backend] 3.0.15-1
Versions of packages live-config recommends:
ii console-tools 1:0.2.3dbs-70
ii keyboard-configuration 1.88
ii live-config-doc 3.0.15-1
ii live-tools 3.0.16-1
ii locales 2.13-37
ii sudo 1.8.5p2-1
ii user-setup 1.48
Versions of packages live-config suggests:
ii pciutils 1:3.1.9-6
ii wget 1.13.4-3
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJQ642gAAoJEKLHmb/f+NfCJKgQAJ56vmy0mcUfaIju+H0Ttuec
vIUS1rYbGgxLiNxTcoNRXudYlzWuOLw8A2/RdBpXUfsHkGvK6J1Y1PUJvpZRhOaZ
Yi63+zkbCV8J7gynVIslek/Goj8dx/NK1p7gmz9GXJ0borgG+lU3Nx1q+FcKNDKD
wTKzHkfnIK6srZhUu+L4VgNdfSHjcSC11i/Uah2/NlEcB0pIuZ1tO3AF/njTfuPT
3di8W4qgxZ8Okb2JYLu3na86w3o3LNbK35+IFrghvDo5z5I2D4iiBqWr9XGqPSlc
ubWuArbZuFjQ8afS9Ab68rbtqWdiQNUf8F/FPkGDPbSV7iO910Lr6ExRx3jLKPcX
BVXnPHDhjxBxBW8wTM6l3WU8t3dXWkxAGrzwsv8wuLWj78LD5Vybk62dT0OVHf4m
AM/iVXVVwuov0ByASp8/s+E5SS1S1BL65Qf4GqavwY4Cxoc8d2G2d6XG0cqrRTvM
8Z6bWeZKhkYjQhhVh9AVc8XoxMMkfJronLPXdBPJ2P0gl3EdsML+TSw6kfriuLR4
2aeN6mMK0ztGC6eLO7RONFeg29ikW0hqBcxwgUjLH3CbOTHVIoiBVrV1pptEm7b6
NePTdh7sAPNBRSDHLv/CBwJkpmIpS7Cx/EV8zNDppzLcrTTRWCYni0WVZPt9oZ70
FTl03E892dCLAaeB+55A
=fEs+
-----END PGP SIGNATURE-----
--- a/scripts/config/0050-locales
+++ b/scripts/config/0050-locales
@@ -40,6 +40,19 @@ Locales ()
Configure_locales ()
{
+ # input is like "locale=ch", so we will convert and setup
+ if echo "${LIVE_LOCALES}" | grep -sqE '^[[:lower:]]{2}$'
+ then
+ _LOCALE_UP=$(echo "${LIVE_LOCALES}" | tr '[a-z]' '[A-Z]')
+ LIVE_LOCALES="${LIVE_LOCALES}_${_LOCALE_UP}.UTF-8"
+ fi
+
+ # input is like "locale=fr_CH", so we will convert and setup
+ if echo "${LIVE_LOCALES}" | grep -sqE '^[[:lower:]]{2}_[[:upper:]]{2}$'
+ then
+ LIVE_LOCALES="${LIVE_LOCALES}.UTF-8"
+ fi
+
if echo "${LIVE_LOCALES}" | grep -qs ","
then
# multiple locales specified
Reply to: