[PATCHv2] dracut-lib.sh: bugfix for pidof function

[PATCHv2] dracut-lib.sh: bugfix for pidof function

[Stig Telfer]

In follow-up, the patch requires a second mod: kernel tasks have a /proc/.../exe that links to nothing and derails the for loop:

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 85f7cdf..05fb1e4 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -967,9 +967,9 @@ if ! command -v pidof >/dev/null 2>/dev/null; then
         [ -z "$_cmd" ] && return 1
         _exe=$(type -P "$1")
         for i in /proc/*/exe; do
-            [ -e "$i" ] || return 1
+            [ -e "$i" ] || continue
             if [ -n "$_exe" ]; then
-                [ "$i" -ef "$_cmd" ] || continue
+                [ "$i" -ef "$_exe" ] || continue
             else
                 _rl=$(readlink -f "$i");
                 [ "${_rl%/$_cmd}" != "$_rl" ] || continue

Re: [PATCHv2] dracut-lib.sh: bugfix for pidof function

[Harald Hoyer]

On 01/24/2014 04:48 PM, Stig Telfer wrote:
> In follow-up, the patch requires a second mod: kernel tasks have a /proc/.../exe that links to nothing and derails the for loop:
> 
> diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
> index 85f7cdf..05fb1e4 100755
> --- a/modules.d/99base/dracut-lib.sh
> +++ b/modules.d/99base/dracut-lib.sh
> @@ -967,9 +967,9 @@ if ! command -v pidof >/dev/null 2>/dev/null; then
>          [ -z "$_cmd" ] && return 1
>          _exe=$(type -P "$1")
>          for i in /proc/*/exe; do
> -            [ -e "$i" ] || return 1
> +            [ -e "$i" ] || continue
>              if [ -n "$_exe" ]; then
> -                [ "$i" -ef "$_cmd" ] || continue
> +                [ "$i" -ef "$_exe" ] || continue
>              else
>                  _rl=$(readlink -f "$i");
>                  [ "${_rl%/$_cmd}" != "$_rl" ] || continue
> 
> --
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Thanks! Pushed.