- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] functions: fix a number of shortcomings in parse_envfile
by Dave Reisner 08 Nov '11

08 Nov '11

Embarassing. This function was just plain broken. - read/trim the correct variables - perform array assignment correctly - ignore comments (only start of line, no midline) - strip quoting via single or double quotes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Sorry about this. I've gone back over the "spec" from systemd source and this is more in line with the behavior. functions | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/functions b/functions index 387f2af..6cec95b 100644 --- a/functions +++ b/functions @@ -73,7 +73,8 @@ unset TZ unset "${localevars[@]}" parse_envfile() { - local file=$1 validkeys=${@:2} ret=0 lineno=0 key= val= + local file=$1 validkeys=("${@:2}") ret=0 lineno=0 key= val= + local -r quotes=$'[\'"]' comments=$'[;#]*' if [[ -z $file ]]; then printf "error: no environment file specified\n" @@ -94,10 +95,14 @@ parse_envfile() { (( ++lineno )) # trim whitespace, avoiding usage of a tempfile - key=$(echo "$1" | { read -r val; echo "$val"; }) - val=$(echo "$1" | { read -r val; echo "$val"; }) + key=$(echo "$key" | { read -r key; echo "$key"; }) - [[ $key ]] || continue + # key must exist and line must not be a comment + [[ -z $key || ${key:0:1} = $comments ]] && continue + + # trim whitespace, strip matching quotes + val=$(echo "$val" | { read -r val; echo "$val"; }) + [[ ${val:0:1} = $quotes && ${val:(-1)} = "${val:0:1}" ]] && val=${val:1:(-1)} if [[ -z $val ]]; then printf "error: found key \`%s' without value on line %s of %s\n" \ @@ -107,8 +112,8 @@ parse_envfile() { fi # ignore invalid keys if we have a list of valid ones - if (( ${#validkeys[*]} )); then - in_array "$key" "${validkeys[@]}" || continue + if (( ${#validkeys[*]} )) && ! in_array "$key" "${validkeys[@]}"; then + continue fi export "$key=$val" || (( ++ret )) -- 1.7.7.2

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.11.1 created. 2011.11.1
by tomegun＠archlinux.org 08 Nov '11

08 Nov '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 annotated tag, 2011.11.1 has been created at 11415b23dd76cb35691e840334d139689c9dbf4d (tag) tagging a90ffd4e4a6c92bc733ac3b50f5c5db1560c3e8f (commit) replaces 2011.10.2 tagged by Tom Gundersen on Tue Nov 8 17:58:32 2011 +1100 - Log ----------------------------------------------------------------- Add preliminary vconsole.conf support Improve shutdown and killall logic Fix locale.sh for zsh ++ Remove minilogd Parse environment files as such, and not as bash Dave Reisner (7): avoid unnecessary escaping of newlines fix non-uniform indentation functions: remove redundant 'return $?' functions: properly quote ${mounts[@]} functions: declare locale vars in an array for reuse functions: implement a environment file parser PKGBUILD: use %Y%m%d format instead of %s Jelle van der Waa (1): Fix misspelt error message Tom Gundersen (10): config: add /etc/vconsole.conf support bits, bytes, who cares? udev: exit on shutdown udev: binary moved, require 174 locale: fix locale.sh for zsh minilogd: kill rc.shutdown: reorder a bit swapoff: umount swap-backed fs before switching off swap bootlog: filter out some more escapecodes locale.sh: fix LC_TELEPHONE/LC_MEASUREMENT ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.11.1
by tomegun＠archlinux.org 08 Nov '11

08 Nov '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 a90ffd4e4a6c92bc733ac3b50f5c5db1560c3e8f (commit) via ec9ec4ad367f494165ced611af6b2641e8cb2472 (commit) via fe1695420fab1476dec28d70b91282c9b30d161e (commit) via dbcb6ce2da54cca82dc0b46e92ed028f79ea4336 (commit) via f1023c3552cc87c5f09516fc0c3c5f0f74326341 (commit) via 6e49b6c5a8ce029856e2db4bce0684105fa7e2fd (commit) via 92417647ce005c5de3de710389a708ff293d1c77 (commit) from fb4e5f6662e32dacb8373274f6ed5592e79472e3 (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 a90ffd4e4a6c92bc733ac3b50f5c5db1560c3e8f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 19:22:38 2011 -0500 PKGBUILD: use %Y%m%d format instead of %s Using seconds from epoch will cause 'makepkg -i' to fail. Lame. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ec9ec4ad367f494165ced611af6b2641e8cb2472 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 19:13:43 2011 -0500 functions: implement a environment file parser This adds a 'parse_envfile' function that reads files such as /etc/locale.conf and /etc/vconsole.conf without sourcing them as bash logic. Several benefits are realized from this: - Impossible to execute arbitrary code - Bad syntax won't prevent the entire file from being read - Possible to limit what variables are allowed Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit fe1695420fab1476dec28d70b91282c9b30d161e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 19:00:10 2011 -0500 functions: declare locale vars in an array for reuse This also fixes a bug that unintentionally sets LOCALE instead of just defaulting to a value when its empty. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit dbcb6ce2da54cca82dc0b46e92ed028f79ea4336 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 16:46:11 2011 -0500 functions: properly quote ${mounts[@]} Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f1023c3552cc87c5f09516fc0c3c5f0f74326341 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 6 16:43:49 2011 -0500 functions: remove redundant 'return $?' Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6e49b6c5a8ce029856e2db4bce0684105fa7e2fd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Oct 18 14:14:04 2011 -0400 fix non-uniform indentation Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 92417647ce005c5de3de710389a708ff293d1c77 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Oct 18 14:12:18 2011 -0400 avoid unnecessary escaping of newlines The bash parser assumes that an expression continues when || is at the end of a line. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD | 2 +- functions | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---------- rc.shutdown | 2 +- rc.sysinit | 16 ++++++------ 4 files changed, 68 insertions(+), 22 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] next release
by Tom Gundersen 07 Nov '11

07 Nov '11

Hi guys, I plan on making a new initscripts release in the not too distant future, so it would be great if you could all take current master for a spin. The major changes (not so major really): 1) minilogd is now gone. It did not do much (anything?) useful anyway, and was probably broken, but no one seemed to care enough to fix it. This means that we are now arch=any :-) 2) I pushed a few more commits just now that should hopefully help with some shutdown issues (I believe Dave could reproduce some problems, could you have a look if this solves it, if you did not already?). 3) There is a fix for some issues with locale on non-bash shells (zsh in particular). After this I'd hope to clean up cryptsetup. The current state is not good, and there are bugs that have been open against it for a very long time. In particular, we should sort out encrypted swap-devices being created before the random seed is loaded (that is bad...), and the parsing of the crypttab file. The main reason I have not touched the former is that I'm hesitant to change code that could potentially overwrite people's drives with random crap. The reason I haven't touched the latter is that I hate the crypttab format we use. If anyone would like to help (preferably someone who uses any of this), that would be highly appreciated. Cheers, Tom

3 7

[arch-projects] [initscripts][PATCH 0/7] Cleanup and new feature
by Dave Reisner 07 Nov '11

07 Nov '11

Hi all, This fixes a couple of items that have been nagging at me, the largest of which being that we parse environment files such as /etc/locale.conf. This is pretty bad, imo, and we shouldn't be doing it. Benefits of not doing it are laid out in the patch that implements it. Tom, I'm not sure when you planned on doing a release, but hopefully some of these are small enough that you won't mind merging them. d Dave Reisner (7): avoid unnecessary escaping of newlines fix non-uniform indentation functions: remove redundant 'return $?' functions: properly quote ${mounts[@]} functions: declare locale vars in an array for reuse functions: implement a environment file parser PKGBUILD: use %Y%m%d format instead of %s PKGBUILD | 2 +- functions | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---------- rc.shutdown | 2 +- rc.sysinit | 16 ++++++------ 4 files changed, 68 insertions(+), 22 deletions(-) -- 1.7.7.2

2 9

[arch-projects] [initscripts] [PATCH] FS#26726 error message should say 'Daemon' instead of 'Dameon' Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
by Jelle van der Waa 05 Nov '11

05 Nov '11

--- rc.d | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc.d b/rc.d index 3f2835e..aed2e42 100755 --- a/rc.d +++ b/rc.d @@ -36,7 +36,7 @@ filter_daemons() { for daemon in "${daemons[@]}"; do # check if daemons is valid if ! have_daemon "$daemon"; then - printf "${C_FAIL}:: ${C_DONE}Dameon script ${C_FAIL}${daemon}${C_DONE} does \ + printf "${C_FAIL}:: ${C_DONE}Daemon script ${C_FAIL}${daemon}${C_DONE} does \ not exist or is not executable.${C_CLEAR}\n" >&2 exit 2 fi -- 1.7.7.2

4 3

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.10.2-11-gfb4e5f6
by tomegun＠archlinux.org 05 Nov '11

05 Nov '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 fb4e5f6662e32dacb8373274f6ed5592e79472e3 (commit) from 1abd8cfb7aeb867c3d7b39dcd620e151228f3a12 (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 fb4e5f6662e32dacb8373274f6ed5592e79472e3 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Nov 5 20:46:01 2011 +0100 Fix misspelt error message FS#26726 error message should say 'Daemon' instead of 'Dameon' [tomegun: fixed commit message] Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> ----------------------------------------------------------------------- Summary of changes: rc.d | 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.10.2-10-g1abd8cf
by tomegun＠archlinux.org 05 Nov '11

05 Nov '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 1abd8cfb7aeb867c3d7b39dcd620e151228f3a12 (commit) via 8b54494acdb9ceda7b24cb4b7c4ca98a5c2b00a6 (commit) from 34714bf34e5928479e5ec4367e5e79902876dfa3 (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 1abd8cfb7aeb867c3d7b39dcd620e151228f3a12 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Nov 6 01:44:38 2011 +0800 locale.sh: fix LC_TELEPHONE/LC_MEASUREMENT Thanks to Fabio Scotoni. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 8b54494acdb9ceda7b24cb4b7c4ca98a5c2b00a6 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Nov 5 13:56:58 2011 +0100 bootlog: filter out some more escapecodes In particular "^[[119G". Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- locale.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] FS#26726 error message should say 'Daemon' instead of 'Dameon'
by Jelle van der Waa 05 Nov '11

05 Nov '11

Just a typo fix, sorry for the misformed patch. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- rc.d | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc.d b/rc.d index 3f2835e..aed2e42 100755 --- a/rc.d +++ b/rc.d @@ -36,7 +36,7 @@ filter_daemons() { for daemon in "${daemons[@]}"; do # check if daemons is valid if ! have_daemon "$daemon"; then - printf "${C_FAIL}:: ${C_DONE}Dameon script ${C_FAIL}${daemon}${C_DONE} does \ + printf "${C_FAIL}:: ${C_DONE}Daemon script ${C_FAIL}${daemon}${C_DONE} does \ not exist or is not executable.${C_CLEAR}\n" >&2 exit 2 fi -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH 1/6] vcs prototypes: remove build directories after making package
by Linus Arver 05 Nov '11

05 Nov '11

For all vcs prototypes, we currently create a temporary build directory. However, we do not delete it after we are done creating the package. This wastes disk space. We already do a "rm -rf" on the build directories every time after we do a checkout anyway, so this patch doesn't really change anything. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 2 ++ prototypes/PKGBUILD-cvs.proto | 2 ++ prototypes/PKGBUILD-darcs.proto | 2 ++ prototypes/PKGBUILD-git.proto | 2 ++ prototypes/PKGBUILD-hg.proto | 2 ++ prototypes/PKGBUILD-svn.proto | 2 ++ 6 files changed, 12 insertions(+), 0 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 81f145f..fca5f36 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -59,6 +59,8 @@ build() { package() { cd "$srcdir/$_bzrmod-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_bzrmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 982c149..997373d 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -60,6 +60,8 @@ build() { package() { cd "$srcdir/$_cvsmod-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_cvsmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 979e9b5..cbeef29 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -61,6 +61,8 @@ build() { package() { cd "$srcdir/$_darcsmod-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_darcsmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 05b721b..7ece6f3 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -59,6 +59,8 @@ build() { package() { cd "$srcdir/$_gitname-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_gitname-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 8474533..df9abd5 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -60,6 +60,8 @@ build() { package() { cd "$srcdir/$_hgrepo-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_hgrepo-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index a08e0e3..f103c78 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -58,6 +58,8 @@ build() { package() { cd "$srcdir/$_svnmod-build" make DESTDIR="$pkgdir/" install + + rm -rf "$srcdir/$_svnmod-build" } # vim:set ts=2 sw=2 et: -- 1.7.7.1

3 6