From 05d024bd9662f3833108ccf85fa574d0c20a51c3ad96d4666dc46cc7d4820a3c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 24 Sep 2008 23:04:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=15 --- boot.md | 4 ++-- mdadm.changes | 5 +++++ mdadm.spec | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/boot.md b/boot.md index 31381f1..668352b 100644 --- a/boot.md +++ b/boot.md @@ -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 diff --git a/mdadm.changes b/mdadm.changes index 105f34f..a69b4e7 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -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 diff --git a/mdadm.spec b/mdadm.spec index 97ec4ce..09e5d24 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -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