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

[arch-projects] [initscripts] [PATCH 07/12] functions: Deprecate in_array(), Add replacement is_in_array()
by Kurt J. Bosch 03 Jul '11

03 Jul '11

* in_array() strips '@' and therefore the name is missleading. * For checking DAEMONS, ck_autostart() should be used. --- functions | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 11f8317..375efbf 100644 --- a/functions +++ b/functions @@ -164,10 +164,23 @@ status() { return 1 } -# usage : in_array( $needle, $haystack ) +# usage : is_in_array( $needle, $haystack ) # return : 0 - found # 1 - not found +# Note: For checking DAEMONS, ck_autostart() should be used! +is_in_array() { + local needle=$1; shift + local item + for item; do + [[ $item = $needle ]] && return 0 + done + return 1 # Not Found +} + +# This is deprecated! +# It strips '@' and therefore the name is missleading. in_array() { + echo "WARNING: Call to deprecated function in_array() from $0" >&2 local needle=$1; shift local item for item; do @@ -274,7 +287,7 @@ kill_everything() { for daemon in /run/daemons/*; do [[ -f $daemon ]] || continue daemon=${daemon##*/} - in_array "$daemon" "${DAEMONS[@]}" || stop_daemon "$daemon" + ck_autostart "$daemon" && stop_daemon "$daemon" done # Shutdown daemons in reverse order @@ -371,7 +384,7 @@ fsck_all() { FSCK_ERR=/dev/stdout FSCK_FD= FORCEFSCK= - [[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f" + [[ -f /forcefsck ]] || is_in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f" run_hook "$1_prefsck" -- 1.7.1

1 0

[arch-projects] [PATCH] [mkinitcpio] Fix -k /path when -b is used
by Gerardo Exequiel Pozzi 02 Jul '11

02 Jul '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkinitcpio | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index dec139b..d4ebf94 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -82,7 +82,7 @@ get_kernver() { return 0 fi - [[ -r "$kernel" ]] || return 1 + [[ -r "$BASEDIR$kernel" ]] || return 1 read _ kernver < <(file -b "$BASEDIR$kernel" | grep -o 'version [^ ]\+') if [[ "$kernver" && -e "$BASEDIR/lib/modules/$kernver" ]]; then -- 1.7.6

2 2

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-16-gda81935
by thomas＠archlinux.org 02 Jul '11

02 Jul '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 "The official mkinitcpio repository". The branch, master has been updated via da81935dbb203340e9f3b394d4f6f4e5b3aa63c4 (commit) via 491a99b8a2531207121d651d8e4b15fe4febbd2b (commit) via 3d42f00ecb01206e27640a40616ca51c71153624 (commit) via c46d8a260d276083092b4a46b049b6aa48a1fdbb (commit) from 712b70757e272e5b41c07a17993ccbb43e7ff84c (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 da81935dbb203340e9f3b394d4f6f4e5b3aa63c4 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sat Jul 2 13:42:25 2011 +0200 Trim leading spaces in MODULES and earlymodules to prevent error messages when one is set to " " commit 491a99b8a2531207121d651d8e4b15fe4febbd2b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 12:07:46 2011 -0400 install modules all at once build an array of paths to modules, and install them all at once with mkdir -p and cp --parents. Cuts back on our major source of calls to install(1). This is a tad ugly in that it creates some amount of data duplication, keeping an array of paths in addition to module names. However, turns out to be a worthwhile tradeoff as merging the two datasets into one results in the need for massive string trimming. commit 3d42f00ecb01206e27640a40616ca51c71153624 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 21:19:11 2011 -0400 functions: reorg, no code changes Mostly, this groups "private" functions together, separate from public functions. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c46d8a260d276083092b4a46b049b6aa48a1fdbb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 21:11:13 2011 -0400 always exit from cleanup There's no use case for us calling cleanup without exiting afterwards, so we can simplify all of our cleanup;exit; calls into just cleanup. This means our sighandler is no longer needed (it wasn't really, to begin with), but we split it up to make sure we exit with a posix-ish 128+signum exit value. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 170 ++++++++++++++++++++++++++++++------------------------------ init | 7 ++- mkinitcpio | 29 ++++------ 3 files changed, 101 insertions(+), 105 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-12-g712b707
by thomas＠archlinux.org 01 Jul '11

01 Jul '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 "The official mkinitcpio repository". The branch, master has been updated via 712b70757e272e5b41c07a17993ccbb43e7ff84c (commit) via b088a105a7aca2f725168393eaee4e6c19cec784 (commit) via ff378318f68224e2568073faa364ad6a327416e8 (commit) via f7ce8941ea55af8f2268575441030728be82d266 (commit) via 2a61a03293b2c2f79f81b792e006d5523a6f7678 (commit) via 8ad503a7866066162828796c66489070d661dc44 (commit) via 549af8c1b9a72cacf8cda41f8dd4b76983930945 (commit) from 726ff1f9466847cbe27e807cf79560070651781c (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 712b70757e272e5b41c07a17993ccbb43e7ff84c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 11:38:22 2011 -0400 functions: call _add_file directly from add_module This avoids an expensive stat call and some other unnecessary path juggling. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b088a105a7aca2f725168393eaee4e6c19cec784 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 11:06:54 2011 -0400 function: fix whitespace errors Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ff378318f68224e2568073faa364ad6a327416e8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 08:31:52 2011 -0400 lsinitcpio: add optional colorized output Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f7ce8941ea55af8f2268575441030728be82d266 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 08:22:41 2011 -0400 lsinitcpio: append, not overwrite found hooks Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 2a61a03293b2c2f79f81b792e006d5523a6f7678 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 23:05:54 2011 -0400 mkinitcpio: use msg instead of echo for hook help Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8ad503a7866066162828796c66489070d661dc44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 19:30:58 2011 -0400 avoid touching the linker directly Much to my chagrin, we're going back to using ldd directly, as it's otherwise too difficult to account for odd setups, such as idiots wanting to create multilib initramfs images, or more commonly -- a 64 bit kernel on a 32 bit userland. Fortunately, we don't suffer too large a regression in speed compared to the previous implementation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 549af8c1b9a72cacf8cda41f8dd4b76983930945 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 19:06:13 2011 -0400 functions: reduce calls to modinfo Cut back to a single call to modinfo, instead of 3, which yields roughly a 30% decrease in execution time for a single run of add_module. This of course varies by module but it's an overall win. Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++- functions | 103 ++++++++++++++++++++++++++++-------------------------------- lsinitcpio | 61 +++++++++++++++++++++++++---------- mkinitcpio | 20 +---------- 4 files changed, 97 insertions(+), 91 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [PATCH] [mkinitcpio] Fix -k /path when -b is used
by Gerardo Exequiel Pozzi 01 Jul '11

01 Jul '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkinitcpio | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 459c828..72a2fb2 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -86,7 +86,7 @@ get_kernver() { return 0 fi - [[ -r "$kernel" ]] || return 1 + [[ -r "$BASEDIR$kernel" ]] || return 1 read _ kernver < <(file -b "$BASEDIR$kernel" | grep -o 'version [^ ]\+') if [[ "$kernver" && -e "$BASEDIR/lib/modules/$kernver" ]]; then -- 1.7.6

2 2

[arch-projects] [PATCH 1/2] functions: reduce calls to modinfo
by Dave Reisner 01 Jul '11

01 Jul '11

Cut back to a single call to modinfo, instead of 3, which yields roughly a 30% decrease in execution time for a single run of add_module. This of course varies by module but it's an overall win. Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- functions | 51 ++++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 27 deletions(-) diff --git a/functions b/functions index 3e3fee9..706a64f 100644 --- a/functions +++ b/functions @@ -56,14 +56,6 @@ in_array() { return 1 # Not Found } -kmodinfo() { - # A wrapper around modinfo, which is aware of our $BASEDIR and - # $KERNELVERSION - # $@: args to modinfo - - modinfo -b "$BASEDIR" -k "$KERNELVERSION" "$@" 2>/dev/null -} - auto_modules() { # Perform auto detection of modules via sysfs. @@ -171,34 +163,39 @@ add_module() { # discovered and added. # $1: module name - local module path fw dep deps + local module path dep deps field value module=${1%.ko*} # skip expensive stuff if this module has already been added in_array "${module//-/_}" "${ADDED_MODULES[@]}" && return - path=$(kmodinfo -0F filename "$module") - if [[ $path ]]; then - # get module firmware - while read -r -d '' fw; do - if [[ -e "$BASEDIR/lib/firmware/$fw" ]]; then - add_file "/lib/firmware/$fw" - fi - done < <(kmodinfo -0F firmware "$module") - - # get module depends - IFS=',' read -r -d '' -a deps < <(kmodinfo -0F depends "$module") - for dep in "${deps[@]}"; do - add_module "$dep" - done - - ADDED_MODULES+=("${module//-/_}") - add_file "${path#$BASEDIR}" || return - else + while IFS=':= ' read -r -d '' field value; do + case "$field" in + filename) + path=$value + ;; + depends) + IFS=',' read -r -a deps <<< "$value" + for dep in "${deps[@]}"; do + add_module "$dep" + done + ;; + firmware) + if [[ -e "$BASEDIR/lib/firmware/$value" ]]; then + add_file "/lib/firmware/$value" + fi + ;; + esac + done < <(modinfo -b "$BASEDIR" -k "$KERNELVERSION" -0 "$module" 2>/dev/null) + + if [[ -z $path ]]; then error "module '$module' not found" return 1 fi + add_file "${path#$BASEDIR}" + ADDED_MODULES+=("${module//-/_}") + # explicit module depends case "$module" in fat) add_module "nls_cp437" ;; -- 1.7.6

1 1