Date: Saturday, October 25, 2014 @ 19:05:09 Author: dreisner Revision: 225324
upgpkg: filesystem 2014.10-1 - avoid overwriting LANG in locale.sh (FS#42162) - give more realistic examples in /etc/crypttab (FS#34452) Modified: filesystem/trunk/PKGBUILD filesystem/trunk/crypttab filesystem/trunk/locale.sh -----------+ PKGBUILD | 8 ++++---- crypttab | 12 ++++++------ locale.sh | 17 ++++++++--------- 3 files changed, 18 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-25 12:39:39 UTC (rev 225323) +++ PKGBUILD 2014-10-25 17:05:09 UTC (rev 225324) @@ -2,7 +2,7 @@ # Maintainer: Tom Gundersen <t...@jklm.no> pkgname=filesystem -pkgver=2014.07 +pkgver=2014.10 pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') @@ -28,17 +28,17 @@ 'a998d1e6c7cc5791a7f4a2b49b2d10ce' '1ec1b16e2a71fad63ab8f147069a5d97' '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' + 'f0a5071f50d8864d2810c44e23eb00cc' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' 'b16a4674ccf3a932ff34c6c8393a4f33' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - '820c520d7d1d26dffa1dce02f728bb1e' + '09bce9236c3729d31aaa528bcf5d198e' '0b6f835598c7640184e476057b3c7722' 'a8a962370cd0128465d514e6a1f74130' '2e193c4a37245f2323ebe87f1a673563' - '4fab2b798deff348e04f05152111aae0') + '2caa30a2c91580dc12f053231f237608') lint() { # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. Modified: crypttab =================================================================== --- crypttab 2014-10-25 12:39:39 UTC (rev 225323) +++ crypttab 2014-10-25 17:05:09 UTC (rev 225324) @@ -9,9 +9,9 @@ # NOTE: Do not list your root (/) partition here, it must be set up # beforehand by the initramfs (/etc/mkinitcpio.conf). -# <name> <device> <password> <options> -# home /dev/hda4 /etc/mypassword1 -# data1 /dev/hda3 /etc/mypassword2 -# data2 /dev/hda5 /etc/cryptfs.key -# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/hdb7 none +# <name> <device> <password> <options> +# home UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37 /etc/mypassword1 +# data1 /dev/sda3 /etc/mypassword2 +# data2 /dev/sda5 /etc/cryptfs.key +# swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 +# vol /dev/sdb7 none Modified: locale.sh =================================================================== --- locale.sh 2014-10-25 12:39:39 UTC (rev 225323) +++ locale.sh 2014-10-25 17:05:09 UTC (rev 225324) @@ -1,14 +1,13 @@ #!/bin/sh -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf +if [ -z "$LANG" ]; then + if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" + elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" + elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf + fi fi LANG=${LANG:-C}