OBS User unknown 2008-09-24 23:04:15 +00:00 committed by Git OBS Bridge
parent 69946dcb88
commit 81e3f5c277
3 changed files with 10 additions and 3 deletions

View File

@ -81,7 +81,7 @@ mdadm_CONFIG="/etc/mdadm.conf"
mdadm_SYSCONFIG="/etc/sysconfig/mdadm"
# udev integration
if [ -x /sbin/udevsettle ] ; then
if [ -x /sbin/udevadm ] ; then
[ -z "$MDADM_DEVICE_TIMEOUT" ] && MDADM_DEVICE_TIMEOUT=60
else
MDADM_DEVICE_TIMEOUT=0
@ -115,7 +115,7 @@ case "$1" in
# Wait for udev to settle
if [ "$MDADM_DEVICE_TIMEOUT" -gt 0 ] ; then
/sbin/udevsettle --timeout="$MDADM_DEVICE_TIMEOUT"
/sbin/udevadm settle --timeout="$MDADM_DEVICE_TIMEOUT"
fi
if test "$BOOT_MD_USE_MDADM_CONFIG" = "yes" -a -e "$mdadm_CONFIG"; then

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 24 18:24:25 CEST 2008 - ro@suse.de
- change "udevsettle" to "udevadm settle"
-------------------------------------------------------------------
Fri Sep 19 11:14:05 CEST 2008 - mmarek@suse.cz

View File

@ -20,7 +20,7 @@
Name: mdadm
Version: 3.0
Release: 1
Release: 2
%define ver 3.0-devel1
BuildRequires: sgmltool
PreReq: %fillup_prereq %insserv_prereq
@ -137,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT
/lib/mkinitrd/scripts/boot-md.sh
%changelog
* Wed Sep 24 2008 ro@suse.de
- change "udevsettle" to "udevadm settle"
* Fri Sep 19 2008 mmarek@suse.cz
- added /var/run/mdadm for mdmon
- fixed build