[PATCH 1/3] dracut: info which module is sourced; updated dracut usage

[PATCH 1/3] dracut: info which module is sourced; updated dracut usage

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

Added description for --confdir.
---
 dracut |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dracut b/dracut
index 3be4989..6b590f5 100755
--- a/dracut
+++ b/dracut
@@ -57,6 +57,8 @@ Creates initial ramdisk images for preloading modules
   -v, --verbose         Verbose output during the build process
   -c, --conf [FILE]     Specify configuration file to use.
                          Default: /etc/dracut.conf
+  --confdir [DIR]       Specify configuration directory to use *.conf files from.
+                         Default: /etc/dracut.conf.d
   -l, --local           Local mode. Use modules from the current working
                          directory instead of the system-wide installed in
                          /usr/share/dracut/modules.d.
@@ -243,6 +245,7 @@ check_modules
 for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
     mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
     if strstr "$mods_to_load" " $mod "; then
+	dinfo "*** Sourcing module $mod"
 	if [[ $kernel_only = yes ]]; then
 	    [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
 	else
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[PATCH 2/3] dracut-functions: info which udev rules are skipped

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 638 bytes --]

I found it useful.  Maybe help others debugging.
---
 dracut-functions |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index 9c2999a..0caf0d6 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -335,8 +335,9 @@ inst_rules() {
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do 
-	rule=$(find_rule "$rule") && \
-	    inst_simple "$rule" "$target/${rule##*/}"
+	rule1=$(find_rule "$rule") && \
+	    inst_simple "$rule1" "$target/${rule1##*/}" \
+	    || dinfo "Skipping udev rule: $rule"
     done
 }
 
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 3/3] dracut-functions: find_rule a bit smarter

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1949 bytes --]

btw cosmetic changes to inst_rules
---
 dracut-functions |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index 0caf0d6..6da36ad 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -319,11 +319,27 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule udev-default.rules
+#   find_rule 50-udev-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
 find_rule() {
+    local rule
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
     for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+        if ls $r/*$1 &>/dev/null; then
+            if [[ -f $r/$1 ]]; then
+                echo "$r/$1"
+                return 0
+            else
+                rule=$(ls "$r"/??"-$1" 2>/dev/null || \
+                    ls "$r"/??"-udev-$1" 2>/dev/null)
+                [[ -f $rule ]] && echo $rule && return 0
+            fi
+        fi
     done
     return 1
 }
@@ -331,13 +347,14 @@ find_rule() {
 # udev rules always get installed in the same place, so
 # create a function to install them to make life simpler.
 inst_rules() { 
-    local target=/etc/udev/rules.d
+    local target=/etc/udev/rules.d rule found
+
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do 
-	rule1=$(find_rule "$rule") && \
-	    inst_simple "$rule1" "$target/${rule1##*/}" \
-	    || dinfo "Skipping udev rule: $rule"
+        found=$(find_rule "$rule") && \
+            inst_simple "$found" "$target/${found##*/}" \
+            || dinfo "Skipping udev rule: $rule"
     done
 }
 
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 3/3] dracut-functions: find_rule a bit smarter

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]

Matches rules filename if it's specified without prefix number.
---
 dracut-functions |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index be6b2e9..1f2528e 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -319,11 +319,32 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule 50-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
+# If there are few matching files, error message is printed.
 find_rule() {
+    local rule t
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
     for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+        if ls $r/*$1 &>/dev/null; then
+            if [[ -f $r/$1 ]]; then
+                echo "$r/$1"
+                return 0
+            else
+                rule=$(ls "$r"/??"-$1" 2>/dev/null)
+                t=($rule)
+                if (( ${#t[@]} > 1 )); then
+                    derror "Ambigous rules filename.  Matches: ${t[@]}"
+                elif [[ -f "$rule" ]]; then
+                    echo $rule
+                    return 0
+                fi
+            fi
+        fi
     done
     return 1
 }
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 3/3] dracut-functions: find_rule a bit smarter

[Victor Lowther]

On Mon, 2010-07-05 at 11:24 +0200, Amadeusz Żołnowski wrote:
> Matches rules filename if it's specified without prefix number.
> ---
>  dracut-functions |   25 +++++++++++++++++++++++--
>  1 files changed, 23 insertions(+), 2 deletions(-)
> 
> diff --git a/dracut-functions b/dracut-functions
> index be6b2e9..1f2528e 100755
> --- a/dracut-functions
> +++ b/dracut-functions
> @@ -319,11 +319,32 @@ inst_symlink() {
>      inst "$realsrc" && ln -s "$realsrc" "$target"
>  }
>  
> -# find a udev rule in the usual places.
> +# find a udev rule in the usual places and try to be smart (just a bit).
> +# See example:
> +#   find_rule default.rules
> +#   find_rule 50-default.rules
> +# All of them will return: /lib/udev/rules.d/50-udev-default.rules
> +# If there are few matching files, error message is printed.
>  find_rule() {
> +    local rule t
> +
>      [[ -f $1 ]] && { echo "$1"; return 0; }
>      for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
# Parsing the output of ls can lead to strange and subtle bugs.
# Use globbing and parameter expansion instead, and go with the first
# matching file.
	local f
	for f in "$r/$1" "$r/${1%%-*}-udev-%{1##*-}" "$r/"*"$1"; do
		[[ -f $f ]] || continue
		echo "$f"
		return 0
>      done
>      return 1
>  }

-- 
Victor Lowther
LPIC2 UCP RHCE 

Re: [PATCH 3/3] dracut-functions: find_rule a bit smarter

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

Victor Lowther <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>:
> # Parsing the output of ls can lead to strange and subtle bugs.
> # Use globbing and parameter expansion instead, and go with the first
> # matching file.
> 	local f
> 	for f in "$r/$1" "$r/${1%%-*}-udev-%{1##*-}" "$r/"*"$1"; do
> 		[[ -f $f ]] || continue
> 		echo "$f"
> 		return 0


Thank you for advice!  I've modified function to the following form:

# Final efect the same as previous, but in addition detects ambiguousness
# among multiple directories.  If it's not desired uncomment the line with
# "break" statement.
find_rule() {
    local rd f files=()

    [[ -f $1 ]] && { echo "$1"; return 0; }

    for rd in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
        for f in "$rd/$1" "$rd"/*-"$1"
        do
            [[ -f $f ]] || continue
            [[ ${f##*/} =~ [0-9][0-9]-.*\.rules ]] || continue
            files+=($f)
        done
        # (( ${#files[@]} >= 1 )) && break
    done

    (( ${#files[@]} < 1 )) && return 1
    (( ${#files[@]} > 1 )) && {
        derror "Ambigous rules filename.  Matches: ${files[@]}"
        return 1
    }

    echo "$files"
}


-- 
PGP key: 1024D/C284750D

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[PATCH] dracut-functions: find_rule a bit smarter; thanks to V. Lowther

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

Matches rules filename if it's specified without prefix number.

Thanks to Victor Lowther for advice of not using ls command.  Use
globbing and parameter expansion instead.
---
 dracut-functions |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index 0caf0d6..7a1d82f 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -319,13 +319,36 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule 50-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
+# If there are few matching files, error message is printed.
 find_rule() {
+    local rd f files=()
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
-    for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+
+    for rd in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
+        for f in "$rd/$1" "$rd"/*-"$1"
+        do
+            [[ -f $f ]] || continue
+            [[ ${f##*/} =~ [0-9][0-9]-.*\.rules ]] || continue
+            files+=($f)
+        done
+        # If detecting ambiguousness among different directories isn't desired,
+        # uncomment this:
+        # (( ${#files[@]} >= 1 )) && break
     done
-    return 1
+
+    (( ${#files[@]} < 1 )) && return 1
+    (( ${#files[@]} > 1 )) && {
+        derror "Ambigous rules filename.  Matches: ${files[@]}"
+        return 1
+    }
+
+    echo "$files"
 }
 
 # udev rules always get installed in the same place, so
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/3] dracut: info which module is sourced; updated dracut usage

[Harald Hoyer]

On 07/05/2010 09:06 AM, Amadeusz Żołnowski wrote:
> Added description for --confdir.
> ---
>   dracut |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/dracut b/dracut
> index 3be4989..6b590f5 100755
> --- a/dracut
> +++ b/dracut
> @@ -57,6 +57,8 @@ Creates initial ramdisk images for preloading modules
>     -v, --verbose         Verbose output during the build process
>     -c, --conf [FILE]     Specify configuration file to use.
>                            Default: /etc/dracut.conf
> +  --confdir [DIR]       Specify configuration directory to use *.conf files from.
> +                         Default: /etc/dracut.conf.d
>     -l, --local           Local mode. Use modules from the current working
>                            directory instead of the system-wide installed in
>                            /usr/share/dracut/modules.d.
> @@ -243,6 +245,7 @@ check_modules
>   for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
>       mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
>       if strstr "$mods_to_load" " $mod "; then
> +	dinfo "*** Sourcing module $mod"
>   	if [[ $kernel_only = yes ]]; then
>   	    [[ -x $moddir/installkernel ]]&&  . "$moddir/installkernel"
>   	else

pushed

Re: [PATCH 2/3] dracut-functions: info which udev rules are skipped

[Harald Hoyer]

On 07/05/2010 09:08 AM, Amadeusz Żołnowski wrote:
> I found it useful.  Maybe help others debugging.
> ---
>   dracut-functions |    5 +++--
>   1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/dracut-functions b/dracut-functions
> index 9c2999a..0caf0d6 100755
> --- a/dracut-functions
> +++ b/dracut-functions
> @@ -335,8 +335,9 @@ inst_rules() {
>       inst_dir "/lib/udev/rules.d"
>       inst_dir "$target"
>       for rule in "$@"; do
> -	rule=$(find_rule "$rule")&&  \
> -	    inst_simple "$rule" "$target/${rule##*/}"
> +	rule1=$(find_rule "$rule")&&  \
> +	    inst_simple "$rule1" "$target/${rule1##*/}" \
> +	    || dinfo "Skipping udev rule: $rule"
>       done
>   }
>

pushed