diff --git a/boot.dmraid b/boot.dmraid index fbe6977..91c7af7 100644 --- a/boot.dmraid +++ b/boot.dmraid @@ -27,7 +27,7 @@ test -x $DMRAID || { echo "dmraid not installed"; else exit 5; fi; } # udev interaction -if [ -x /sbin/udevsettle ]; then +if [ -x /sbin/udevadm ]; then [ -z "$DMRAID_DEVICE_TIMEOUT" ] && DMRAID_DEVICE_TIMEOUT=60 else DMRAID_DEVICE_TIMEOUT=0 @@ -40,7 +40,7 @@ case "$1" in # Waiting for udev to settle if [ "$DMRAID_DEVICE_TIMEOUT" -gt 0 ] ; then echo "Waiting for udev to settle..." - /sbin/udevsettle --timeout=$DMRAID_DEVICE_TIMEOUT + /sbin/udevadm settle --timeout=$DMRAID_DEVICE_TIMEOUT fi echo "Activating dmraid..." $DMRAID -ay -p $DMRAID_START_OPTIONS diff --git a/dmraid.changes b/dmraid.changes index 7b31b06..2fb9dbc 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 24 18:25:01 CEST 2008 - ro@suse.de + +- change "udevsettle" to "udevadm settle" + ------------------------------------------------------------------- Tue Sep 16 17:36:09 CEST 2008 - mkoenig@suse.de diff --git a/dmraid.spec b/dmraid.spec index e5e6199..16c2dfd 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -27,7 +27,7 @@ Group: System/Base AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc14 -Release: 95 +Release: 96 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -205,6 +205,8 @@ install -D -m644 reg_tool/dm_dso_reg_tool.8 $RPM_BUILD_ROOT/usr/share/man/man8/d /%{_lib}/libdmraid-events.so.0 %changelog +* Wed Sep 24 2008 ro@suse.de +- change "udevsettle" to "udevadm settle" * Tue Sep 16 2008 mkoenig@suse.de - ignore the timestamp for LSI 1068E DDF1 metadata [bnc#426615] * Mon Sep 15 2008 ro@suse.de