- Arch-projects - lists.archlinux.org

[arch-projects] [initscripts][RFC][PATCH] locale.sh: add support for user-specific locale.conf, drop DAEMON_LOCALE
by Tom Gundersen 04 Sep '12

04 Sep '12

We use the first configuration file we find out of: * $XDG_CONFIG_HOME/locale.conf * /etc/locale.conf * /etc/rc.conf All subsequent config files are ignored. E.g., an emtpy /etc/locale.conf means that LOCALE from rc.conf is ignored. This will easily allow users to set one locale to be used for daemons/boot and a separate one to be used for users consoles etc. This eliminates the need for DAEMON_LOCALE, so remove that functionality. A post-install note will be added. The constraints that led to this suggestion: 1) The default locale should work even if locale-gen has not been run, i.e., it should be "C". 2) It is common to want the system locale to be "English", which a priori "C" satisfies. However, "C" is not UTF-8, which causes issues when the user locale is in UTF-8 (as it is the system locale that configures the console mode). 3) Users might (and often do) want a different locale than what is used system-wide. Moreover, different users might want different locales. In case this seems far-fetched: This computer is shared by two people neither of whose mother tongue is English (and whose mother tongue is not the same). I also want all my daemons to output in English so I can paste the output in bug reports etc. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- functions | 24 ++++++++---------------- locale.sh | 10 ++++++---- rc.conf.5.txt | 13 +++---------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/functions b/functions index e8ff7b8..7e7549a 100644 --- a/functions +++ b/functions @@ -9,7 +9,14 @@ localevars=(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 LC_ALL) -vconsolevars=(KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP) + +# clear the TZ envvar, so daemons always respect /etc/localtime +unset TZ + +# sanitize the locale settings +unset "${localevars[@]}" + +. /etc/profile.d/locale.sh if [[ $1 == "start" ]]; then if [[ $STARTING ]]; then @@ -66,12 +73,6 @@ if (( $? != 3 )); then fi unset TERM_COLORS -# clear the TZ envvar, so daemons always respect /etc/localtime -unset TZ - -# sanitize the locale settings -unset "${localevars[@]}" - parse_envfile() { local file=$1 validkeys=("${@:2}") ret=0 lineno=0 key= val= local -r quotes=$'[\'"]' comments=$'[;#]*' @@ -723,15 +724,6 @@ if (( RC_FUNCTIONS_HOOK_FUNCS_DEFINED != 1 )); then declare -r RC_FUNCTIONS_HOOK_FUNCS_DEFINED=1 fi -if [[ $DAEMON_LOCALE != [nN][oO] ]]; then - export LANG=${LOCALE:-C} - if [[ -r /etc/locale.conf ]]; then - parse_envfile /etc/locale.conf "${localevars[@]}" - fi -else - export LANG=C -fi - # set colors if [[ $USECOLOR != [nN][oO] ]]; then if tput setaf 0 &>/dev/null; then diff --git a/locale.sh b/locale.sh index c465f6f..48c3c50 100644 --- a/locale.sh +++ b/locale.sh @@ -1,10 +1,12 @@ unset LANG -if [ -s /etc/locale.conf ]; then +if [ -s $XDG_CONFIG_HOME/locale.conf ]; then + . $XDG_CONFIG_HOME/locale.conf +elif [ -s $HOME/.config/locale.conf ]; then + . $HOME/.config/locale.conf +elif [ -s /etc/locale.conf ]; then . /etc/locale.conf -fi - -if [ -z "$LANG" ] && [ -s /etc/rc.conf ]; then +elif [ -s /etc/rc.conf ]; then LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") fi diff --git a/rc.conf.5.txt b/rc.conf.5.txt index 73c2423..8983871 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -190,21 +190,14 @@ FONT_MAP in /etc/vconsole.conf takes precedence (see vconsole.conf(5)), and is r This sets your system language, which will be used by all i18n-friendly applications and utilities. See `locale -a` (or locale.gen) for available options. -LANG in /etc/locale.conf takes precedence (see locale.conf(5)), and is recommended. +LANG in /etc/locale.conf takes precedence (see locale.conf(5)), and is recommended. User-specific +locale settings which override both /etc/locale.conf and /etc/rc.conf are set in +$XDG_CONFIG_HOME/locale.conf using the same syntax as /etc/locale.conf. If unset, it falls back to the C locale. LOCALE="en_US.UTF-8" -*DAEMON_LOCALE=* - - - If set to 'no', export the C locale to daemons and during the boot process. - - Otherwise, export LANG (or LOCALE) as configured in /etc/locale.conf (or /etc/rc.conf). - -Leave this unset, unless you have a specific reason to set it to 'no'. - - DAEMON_LOCALE="yes" - *USECOLOR=* Use ANSI color sequences in start-up messages, unless set to 'no'. -- 1.7.11.4

3 12

[arch-projects] [devtools] [PATCH] mkarchroot: Avoid binding cache dirs in the host mirror path
by Jan Alexander Steffens (heftig) 02 Sep '12

02 Sep '12

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> This is a workaround that should prevent the zombie mounts we've been seeing on brynhild that crept up when combining systemd's shared-by-default mounts, nested bind mounts and concurrent mkarchroots. So get rid of the nested bind mounts. A more proper fix would probably be to --make-slave every bind we're making. I've been looking into doing that along with using systemd-nspawn. Alas, nspawn currently seems to be interactive-use only, as it expects a terminal on STDIN and epoll-able STDOUT. --- mkarchroot.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mkarchroot.in b/mkarchroot.in index 5bcde76..519837a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -75,6 +75,8 @@ fi host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#') if echo "${host_mirror}" | grep -q 'file://'; then host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g') + # Remove cache dirs in host mirror path, those are handled specially to avoid additional binds + cache_dirs=( "${cache_dirs[@]/${host_mirror_path}*/}" ) fi # {{{ functions @@ -149,7 +151,12 @@ copy_hostconf () { cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf fi - sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i ${working_dir}/etc/pacman.conf + local conf_cache_dirs=( "${cache_dirs[@]}" ) + if [[ -n ${host_mirror_path} ]]; then + conf_cache_dirs+=( "${host_mirror_path}"/pool/{packages,community} ) + fi + + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${conf_cache_dirs[@]})|" -i ${working_dir}/etc/pacman.conf } chroot_umount () { -- 1.7.12

2 2

[arch-projects] [netcfg] [GIT] netcfg network scripts repository annotated tag 2.8.10 created. 2.8.10
by jouke＠archlinux.org 30 Aug '12

30 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "netcfg network scripts repository". The annotated tag, 2.8.10 has been created at c07b9d6cb7b86cf01c1101d4367a1d6f8dbeec0d (tag) tagging 1982c0461624aa3c6a20a3db98365067e6d5d065 (commit) replaces 2.8.9 tagged by Jouke Witteveen on Fri Aug 31 00:29:16 2012 +0200 - Log ----------------------------------------------------------------- Release 2.8.10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJQP+lIAAoJEFa2H7+CSSwVe2wH/i0+vScjeM7sIKkQ/O8fHjAB FoqQJYi0OlFCqBy5n3iYH6qCyi3B+3jtMuYYNDN2gpvprBJnfZyAtXrtUb6QjOVA GUjRYp9inxfnG4marmDyZh8qmVG3h0vEUiszCs9KoLGlyevx8Vrz7NNWWGylqtbe V2yU0sy/fboLWV3BbhR8WalrLlKU9VOs9/OthY5Tb8zuNgDfvtZQKgJBjw+VAhQk qbChw/jt3yzwETQIu5aRc1t8/lbccejgn60zisG4GPH62/5wOK5vOqE7WISTM2uO +PIFiv1uF5SlrPvHwQoGukzr3UWinIgWdoe6MrWE+K21iM3RFFC2HIPjcDvUSYk= =ZSfY -----END PGP SIGNATURE----- Jouke Witteveen (2): ifplugd path change (FS#31340) 2.8.10 release updates Thomas Bächler (1): Allow hex passphrase in wifi-menu ----------------------------------------------------------------------- hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.9-3-g1982c04
by jouke＠archlinux.org 30 Aug '12

30 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "netcfg network scripts repository". The branch, master has been updated via 1982c0461624aa3c6a20a3db98365067e6d5d065 (commit) via 53a051ec9026ce430755792720401001ad2d2260 (commit) from bba8d3f50075695c3fb1d1bb6d623c1f6d41b7c0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1982c0461624aa3c6a20a3db98365067e6d5d065 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Aug 31 00:28:10 2012 +0200 2.8.10 release updates commit 53a051ec9026ce430755792720401001ad2d2260 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Aug 31 00:21:54 2012 +0200 ifplugd path change (FS#31340) Needed after ifplugd: 0.28-12 update. ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++-- NEWS | 4 ++++ rc.d/net-auto-wired | 6 +++--- systemd/net-auto-wired.service | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.10-7-g8291fd0
by dreisner＠archlinux.org 30 Aug '12

30 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The branch, master has been updated via 8291fd0f3965fa7ea2790d17d2e53c8b9c252863 (commit) via 6d29e9d191a78819ad349205e23921a242a64285 (commit) from 61b9ae1a0960890bb8d65d30ef9af5dbd6aeea14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8291fd0f3965fa7ea2790d17d2e53c8b9c252863 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 30 08:49:33 2012 -0400 init: add support for root=PARTLABEL=foo Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6d29e9d191a78819ad349205e23921a242a64285 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 26 16:09:01 2012 -0400 mkinitcpio.8: fix typo Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: init_functions | 2 +- mkinitcpio.8.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.08.3-3-gc67d598
by tomegun＠archlinux.org 27 Aug '12

27 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via c67d598d1cb2c346c83b72449bf20ee5dfea9ae7 (commit) via b603bf95b18c60fba4d6aa3ad2cb597c197ca6b5 (commit) from 41b8e8b66bfeb2a6bb851355ea141d7064eddb10 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c67d598d1cb2c346c83b72449bf20ee5dfea9ae7 Merge: 41b8e8b b603bf9 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Aug 27 22:51:40 2012 +0200 Merge branch 'kill-DAEMON_LOCALE' Conflicts: functions commit b603bf95b18c60fba4d6aa3ad2cb597c197ca6b5 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Aug 11 04:29:29 2012 +0200 move archlinux(7) and locale.sh to filesystem The new locale.sh makes DAEMON_LOCALE redundant, so we remove that functionality. A post-upgrade notice will be added. The new functionality will apply the settings to /etc/locale.conf system-wide, and allow each user to override it in $HOME/.config/locale.conf. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 11 ++------ archlinux.7.txt | 80 ----------------------------------------------------- functions | 22 ++------------- locale.sh | 83 ------------------------------------------------------- rc.conf.5.txt | 13 ++------- 5 files changed, 8 insertions(+), 201 deletions(-) delete mode 100644 archlinux.7.txt delete mode 100644 locale.sh hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.08.3-1-g41b8e8b
by tomegun＠archlinux.org 27 Aug '12

27 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 41b8e8b66bfeb2a6bb851355ea141d7064eddb10 (commit) from 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 41b8e8b66bfeb2a6bb851355ea141d7064eddb10 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Aug 23 11:22:53 2012 +0200 add some deprecation warnings As we are moving to systemd, alert initscripts users in case they use the legacy configuration options. The legacy options will still work in initscripts, but eventually will not work with systemd. In other words, most users will want to switch to the new settings. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 7 ++++++- network | 4 +--- rc.sysinit | 53 +++++++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 28 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2012.08.1 created. 2012.08.1
by tomegun＠archlinux.org 20 Aug '12

20 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The annotated tag, 2012.08.1 has been created at 9947c23b33c3f05c92c5d67e6a13511dd0683105 (tag) tagging e060bec18062ae0a0f719200523880476017c1e0 (commit) replaces 2012.07.5 tagged by Tom Gundersen on Sat Aug 4 00:58:53 2012 +0200 - Log ----------------------------------------------------------------- features: merge initscripts-systemd use the merged arch-modules-load in initscripts too bugfixes: encryption+lvm lots of documentation fixes fix warning about broken HARDWARECLOCK settings skip non-daemons when generating wrapper services fix rc.local.shutdown under systemd Dave Reisner (1): archlinux.7: fix reference to syslinux config file Eric Bélanger (2): archlinux man page: fix typos archlinux man page: fix vconcole man page reference Tom Gundersen (9): merge initscripts-systemd arch-daemons: add some sanity checking man: archlinux typo rc-local-shutdown.service: don't conflict with shutdown.target rc.sysinit: fix adjtime warning lvm: fix activation of lvm after cryptestup man: clarify symlinking in archlinux(7) network: fix warning on trying to start a running network modprobe: pass everything to systemd-modules-load ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2012.08.2 created. 2012.08.2
by tomegun＠archlinux.org 20 Aug '12

20 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The annotated tag, 2012.08.2 has been created at 944a1433946ce8c1d70d2865047c2761d8719aeb (tag) tagging 9c4808d333758205b689ffc37c561d268e7faf53 (commit) replaces 2012.08.1 tagged by Tom Gundersen on Thu Aug 9 23:23:17 2012 +0200 - Log ----------------------------------------------------------------- add some documentation for the systemd compat layer Tom Gundersen (2): systemd: mask netfs.service arch-modules-load, arch-daemons: add manpages ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2012.08.3 created. 2012.08.3
by tomegun＠archlinux.org 20 Aug '12

20 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The annotated tag, 2012.08.3 has been created at 8f5d7858c6072945a2f5b3a20131d330ad7e628b (tag) tagging 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (commit) replaces 2012.08.2 tagged by Tom Gundersen on Mon Aug 20 16:33:41 2012 +0200 - Log ----------------------------------------------------------------- systemd-cryptsetup fixes allow legacy daemons to be ignored at boot Dave Reisner (2): functions: support UUID tags in /etc/crypttab functions: support quoted UUID/PARTUUID in crypttab Jan Alexander Steffens (heftig) (2): Add special target for rc.conf DAEMONS Remove SourcePath from arch-modules-load.service Tom Gundersen (7): man: fix path to arch-daemons generator update .gitignore Merge remote-tracking branch 'falconindy/working' cryptsetup: support the password being unset systemd: fix typos in service files arch-daemons.target: add link to documentation arch-daemons.target: add some documentation ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0