From 3f55dd78debd0c0146240c6f65ee5d9e8e93539e Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 21 Jan 2015 18:43:19 +0200 Subject: [PATCH] no astribank_is_starting with hotplug asterisk Don't run the final astribank_is_starting if asterisk is hotpluggable. Likewise, if there's no xpp_order file, waiting is pointless as the hook can't count Astribanks. Signed-off-by: Tzafrir Cohen --- xpp/waitfor_xpds | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpp/waitfor_xpds b/xpp/waitfor_xpds index fa7ab4f..876a0c8 100755 --- a/xpp/waitfor_xpds +++ b/xpp/waitfor_xpds @@ -148,11 +148,15 @@ cat /sys/bus/astribanks/devices/*/waitfor_xpds 2> /dev/null || : # Wait for device to stabilize and XPD's to finish initalizations echo 1>&2 "Astribanks initializing spans" -if [ "$XPP_HOTPLUG_DAHDI" = yes ]; then - if [ "$CALLED_FROM_ATRIBANK_HOOK" = '' ]; then +if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" = '' -a \ + "$ASTERISK_SUPPORTS_DAHDI_HOTPLUG" != 'yes' ]; then + if [ -f /etc/dahdi/xpp_order ]; then # Now we can wait until the hotplug run would remove the semaphore echo -n 1>&2 "Other DAHDI initializations... " astribank_is_starting -v -w 1>&2 + else + echo 1>&2 "WARNING: No ASTERISK_SUPPORTS_DAHDI_HOTPLUG" \ + " and no /etc/dahdi/xpp_order" fi fi # All Astribanks initialized -- remove semaphore