August 2011 - Arch-projects - lists.archlinux.org

[arch-projects] [INITSCRIPTS][PATCH] rc.d: list [started|stopped|auto|noauto|daemon]
by Sebastien Luttringer 23 Aug '11

23 Aug '11

list command can take new arguments auto/noauto. list command can take a list of daemon to list. All kind of arguments can be mixed to obtain the proper output. zsh and bash completion are updated Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- bash-completion | 2 +- rc.d | 71 ++++++++++++++++++++++++++++++++++++++---------------- zsh-completion | 2 +- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/bash-completion b/bash-completion index d78484e..718df6d 100644 --- a/bash-completion +++ b/bash-completion @@ -10,7 +10,7 @@ _rc_d() elif [[ "$prev" == help ]]; then COMPREPLY=() elif [[ "$prev" == list ]]; then - ((COMP_CWORD == 2)) && COMPREPLY=($(compgen -W "started stopped" -- "$cur")) || COMPREPLY=() + COMPREPLY=($(compgen -W "started stopped auto noauto $(cd /etc/rc.d && compgen -f -X 'functions*')" -- "$cur")) elif [[ "$prev" == start ]]; then COMPREPLY=($(comm -23 <(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort) <(cd /run/daemons/ && compgen -f "$cur"|sort))) elif [[ "$prev" =~ stop|restart|reload ]]; then diff --git a/rc.d b/rc.d index 3d34edf..81a07eb 100755 --- a/rc.d +++ b/rc.d @@ -4,11 +4,12 @@ NEED_ROOT=0 # this script can be run without be root . /etc/rc.conf . /etc/rc.d/functions +# print usage and exit usage() { local name=${0##*/} cat >&2 << EOF usage: $name <action> <daemon> [daemon] ... - $name list [started|stopped] + $name list [started|stopped|auto|noauto|daemon] $name help <daemon> is the name of a script in /etc/rc.d @@ -17,40 +18,68 @@ WARNING: initscripts are free to implement or not the above actions. e.g: $name list $name list started + $name list sshd gpm $name help $name start sshd gpm EOF exit 1 } +# list action +list() { + local mode s_status s_auto + local -a daemons + # parse arguments + for p; do + case "$p" in + started) mode=started;; + stopped) mode=stopped;; + auto) mode=auto;; + noauto) mode=noauto;; + *) daemons=(${daemons[@]} "$p");; + esac + done + # if no daemon are specified take all executable file in /etc/rc.d + if ! [[ $daemons ]]; then + cd /etc/rc.d + for d in *; do + [[ -x "$d" && ! -d "$d" ]] && daemons=(${daemons[@]} "$d") + done + fi + # building string to display + for d in "${daemons[@]}"; do + # check if d is a valid daemon name + have_daemon "$d" || continue + # print running / stopped satus + if ! ck_daemon "$d"; then + [[ $mode == stopped ]] && continue + s_status="${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" + else + [[ $mode == started ]] && continue + s_status="${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" + fi + # print auto / manual status + if ! ck_autostart "$d"; then + [[ $mode == noauto ]] && continue + s_auto="${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" + else + [[ $mode == auto ]] && continue + s_auto="${C_OTHER}[${C_FAIL} ${C_OTHER}]" + fi + printf "$s_status$s_auto${C_CLEAR} $d\n" + done +} + (( $# < 1 )) && usage declare -i ret=0 case $1 in help) usage - ;; + ;; list) shift - cd /etc/rc.d/ - for d in *; do - have_daemon "$d" || continue - # print running / stopped satus - if ! ck_daemon "$d"; then - [[ "$1" == stopped ]] && continue - printf "${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" - else - [[ "$1" == started ]] && continue - printf "${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" - fi - # print auto / manual status - if ! ck_autostart "$d"; then - printf "${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" - else - printf "${C_OTHER}[${C_FAIL} ${C_OTHER}]" - fi - printf " ${C_CLEAR}$d\n" - done + list "$@" ;; *) # check min args count diff --git a/zsh-completion b/zsh-completion index e5c2850..b324e5c 100644 --- a/zsh-completion +++ b/zsh-completion @@ -19,7 +19,7 @@ _rc.d () { _arguments "*: :" ;; list) - _arguments "2: :(started stopped)" + _arguments "*: :(started stopped auto noauto $(echo /etc/rc.d/*(N-*:t)))" ;; start) _arguments "*: :($(comm -23 <(echo /etc/rc.d/*(N-*:t)|tr ' ' '\n') <(echo /run/daemons/*(N:t)|tr ' ' '\n')))" -- Sebastien "Seblu" Luttringer

5 6

[arch-projects] [INITSCRIPTS][PATCH 1/4] Let background daemons show errors on stderr
by Sebastien Luttringer 23 Aug '11

23 Aug '11

Daemon running in background should let error output to be printed. Standart output is still hided to have a correct printing in default cases. This will help to detect error in daemon runned in background. This will also remove have_daemon call which is already called in start_daemon. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index f68c088..eaa1374 100644 --- a/functions +++ b/functions @@ -218,7 +218,7 @@ ck_depends() { start_daemon_bkgd() { stat_bkgd "Starting $1" - have_daemon "$1" && (start_daemon "$1") &>/dev/null & + (start_daemon "$1") >/dev/null & } stop_daemon() { -- Sebastien "Seblu" Luttringer

4 10

[arch-projects] [devtools] [PATCH] archrelease: Copy new files from trunk
by Lukas Fleischer 21 Aug '11

21 Aug '11

Currently, files that have just been added to trunk are not copied to the repositories when invoking archrelease, as `svn ls` does not list them if we don't `svn update` explicitly before. Use `svn ls -r HEAD` to include everything from current HEAD. Fixes FS#25680. Reported-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Pierre, note that this one is based on my recent refactoring patches. You should push them before pushing this one. Let me know if you don't plan to do so and I'll rebase this one :) Oh, and by the way: SVN sucks :) archrelease | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archrelease b/archrelease index 287c5e7..2ca0b95 100755 --- a/archrelease +++ b/archrelease @@ -30,7 +30,7 @@ if [[ $(svn status -q) ]]; then fi pushd .. >/dev/null -IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk") +IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "trunk") for file in "${known_files[@]}"; do if [[ ${file:(-1)} = '/' ]]; then abort "archrelease: subdirectories are not supported in package directories!" -- 1.7.6

1 2

[arch-projects] [devtools] [PATCH 1/4] archrelease: Remove redundant directory check
by Lukas Fleischer 20 Aug '11

20 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- archrelease | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/archrelease b/archrelease index af75b8f..ec7545e 100755 --- a/archrelease +++ b/archrelease @@ -37,14 +37,9 @@ if [[ -d repos/$1 ]]; then trash+=("repos/$1/$file") done < <(svn ls "repos/$1") svn rm -q "${trash[@]}" -fi -if [[ ! -d repos ]]; then - mkdir repos - svn add -q repos -fi -if [[ ! -d "repos/$1" ]]; then - mkdir "repos/${1}" - svn add -q "repos/${1}" +else + mkdir -p "repos/${1}" + svn add --parents -q "repos/${1}" fi IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk") for file in "${known_files[@]}"; do -- 1.7.6

2 7

[arch-projects] [PATCH] Clean up more ANSI codes from /var/log/boot (close FS#25682)
by Eric Bélanger 20 Aug '11

20 Aug '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index bd05fa8..f68c088 100644 --- a/functions +++ b/functions @@ -435,7 +435,7 @@ bootlogd_stop() { kill $(< /run/bootlogd.pid) rm -f /run/bootlogd.pid sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \ - -e 's/\^\[(\[151|%)G//g' /var/log/boot + -e 's/\^\[(\[1[0-9]1|%)G//g' -e 's/\^\[\[0;1//g' /var/log/boot } ############################### -- 1.7.6

3 4

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3-13-gabd2fa8
by tomegun＠archlinux.org 20 Aug '11

20 Aug '11

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 abd2fa8211a58761782c0b396f8e9c9d8a516abc (commit) from d4723155ff86d49d1e98e05d04d20fd058340704 (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 abd2fa8211a58761782c0b396f8e9c9d8a516abc Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Aug 20 13:43:51 2011 +0200 Clean up more ANSI codes from /var/log/boot (close FS#25682) Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3-12-gd472315
by tomegun＠archlinux.org 20 Aug '11

20 Aug '11

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 d4723155ff86d49d1e98e05d04d20fd058340704 (commit) via a1e44e2633596e7f12364ec3e33b4012332046bb (commit) via 3ee7b326ad6d60b0d713cfd5c958c18e111b9e28 (commit) from 7f840b99aa649eb899aa11f5e91e1e81f4f3672a (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 d4723155ff86d49d1e98e05d04d20fd058340704 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Aug 20 11:23:15 2011 +0200 boot.log: clean ANSI codes Suggested-by: Karol B?a?ewicz <karol.blazewicz(a)gmail.com> Suggested-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit a1e44e2633596e7f12364ec3e33b4012332046bb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:29:16 2011 -0400 rc.d: clarify error when [[ -x /etc/rc.d/$i ]] fails A script marked a-x will be reported as missing, when in fact it's only non-executable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3ee7b326ad6d60b0d713cfd5c958c18e111b9e28 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:17:41 2011 -0400 network: error out on missing or unknown interface This was caused by commit fc9ce46483fc4d -- if the user has no interface defined but also has no legacy variables defined, our legacy check fails, and we try to bring up the network using an empty declaration. Add in an additional safeguard of checking sysfs to see that the interface really does exist. Fixes FS#25671 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- network | 16 ++++++++++++++++ rc.d | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [PATCH] [initscripts] Make locale.sh consistent with default rc.conf
by Gerardo Exequiel Pozzi 19 Aug '11

19 Aug '11

rc.conf defaults LOCALE to en_US.UTF-8 Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- locale.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/locale.sh b/locale.sh index 611a797..6723f95 100644 --- a/locale.sh +++ b/locale.sh @@ -1,3 +1,3 @@ . /etc/rc.conf -export LANG=${LOCALE:=en_US} +export LANG=${LOCALE:=en_US.UTF-8} -- 1.7.6

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3-9-g7f840b9
by tomegun＠archlinux.org 19 Aug '11

19 Aug '11

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 7f840b99aa649eb899aa11f5e91e1e81f4f3672a (commit) from a5967ed214a194b54647342f38ae78d695d497a1 (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 7f840b99aa649eb899aa11f5e91e1e81f4f3672a Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Aug 19 12:17:25 2011 +0200 locale.sh: added missing file to git Reported-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: locale.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 locale.sh hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3-8-ga5967ed
by tomegun＠archlinux.org 19 Aug '11

19 Aug '11

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 a5967ed214a194b54647342f38ae78d695d497a1 (commit) via 4ef7a256acddfdd0cbb54e9018f0d8fadbc0cae1 (commit) from b94d35b9a2325d822dede0a72fca561f7a7daf7a (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 a5967ed214a194b54647342f38ae78d695d497a1 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Aug 18 23:56:08 2011 +0200 functions: fix typo in warning message Fixes #25623. Reported-by: Segej Puykin <arch(a)sergej.pp.ru> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 4ef7a256acddfdd0cbb54e9018f0d8fadbc0cae1 Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Aug 5 00:33:10 2011 +0200 locale: make /etc/profile.d/locale.sh dynamic locale.sh parses rc.conf at runtime and sets the LOCALE accordingly, rather than writing a static file at every boot. This eliminates yet another write to /etc. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 ++ functions | 2 +- rc.sysinit | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

2 1