Hello community, here is the log from the commit of package mdadm checked in at Wed Apr 26 10:45:56 CEST 2006. -------- --- mdadm/mdadm.changes 2006-04-25 13:40:37.000000000 +0200 +++ STABLE/mdadm/mdadm.changes 2006-04-26 10:09:41.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 26 09:46:28 CEST 2006 - hare@suse.de + +- Fix init script dependencies +- Implement MDADM_DEVICE_TIMEOUT to set a timeout for + udevsettle (#149979) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.eGArqH/_old 2006-04-26 10:45:38.000000000 +0200 +++ /var/tmp/diff_new_pack.eGArqH/_new 2006-04-26 10:45:38.000000000 +0200 @@ -12,7 +12,7 @@ Name: mdadm Version: 2.2 -Release: 22 +Release: 25 BuildRequires: opensp sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools @@ -135,6 +135,10 @@ %{_var}/adm/fillup-templates/sysconfig.mdadm %changelog -n mdadm +* Wed Apr 26 2006 - hare@suse.de +- Fix init script dependencies +- Implement MDADM_DEVICE_TIMEOUT to set a timeout for + udevsettle (#149979) * Tue Apr 25 2006 - mjancar@suse.cz - add static device nodes for udev (#168824) * Wed Apr 19 2006 - mjancar@suse.cz ++++++ boot.md ++++++ --- mdadm/boot.md 2006-03-08 18:24:36.000000000 +0100 +++ STABLE/mdadm/boot.md 2006-04-26 10:08:18.000000000 +0200 @@ -21,7 +21,7 @@ # ### BEGIN INIT INFO # Provides: boot.md -# Required-Start: boot.proc +# Required-Start: boot.proc boot.udev # X-SUSE-Should-Start: boot.ibmsis boot.scsidev boot.multipath # Default-Start: B # Default-Stop: @@ -79,6 +79,13 @@ mdadm_CONFIG="/etc/mdadm.conf" mdadm_SYSCONFIG="/etc/sysconfig/mdadm" +# udev integration +if [ -x /sbin/udevsettle ] ; then + [ -z "$MDADM_DEVICE_TIMEOUT" ] && MDADM_DEVICE_TIMEOUT=60 +else + MDADM_DEVICE_TIMEOUT=0 +fi + function _rc_exit { [ "x$2" != x"" ] && echo -n $2 rc_failed $1 @@ -106,6 +113,11 @@ [ ! -f /proc/mdstat -a -x /sbin/modprobe ] && /sbin/modprobe -k md_mod 2>&1 | : [ -f /proc/mdstat ] || _rc_exit 5 "... no MD support in kernel " + # Wait for udev to settle + if [ "$MDADM_DEVICE_TIMEOUT" -gt 0 ] ; then + /sbin/udevsettle --timeout="$MDADM_DEVICE_TIMEOUT" + fi + # Fallback to mdrun when $mdadm_CONFIG missing or mdadm exits with an error [ "$BOOT_MD_USE_MDADM_CONFIG" = "yes" -a -s "$mdadm_CONFIG" ] [ $? = 0 ] && { $mdadm_BIN -A -s -c $mdadm_CONFIG || rc_failed 1; } ++++++ sysconfig.mdadm ++++++ --- mdadm/sysconfig.mdadm 2006-04-19 10:22:02.000000000 +0200 +++ STABLE/mdadm/sysconfig.mdadm 2006-04-26 10:04:48.000000000 +0200 @@ -57,3 +57,13 @@ # "yes" for mdadm.conf to be used for array assembly on boot # BOOT_MD_USE_MDADM_CONFIG=yes + +## Type: integer +## Default: 60 +# +# Timeout for udev device detection. This is the upper limit which the +# boot script will wait for udev to finish hotplug event processing. +# If not all devices are detected during boot this value should be +# increased. Setting this to '0' disables waiting for udev. +# +MDADM_DEVICE_TIMEOUT="60" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...