From 73c32a2f833ac0074f42ea83ad101f3dfe139b5d Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Thu, 30 Jan 2014 20:57:46 +0100 Subject: [PATCH] marsadm: make device detection more robust --- userspace/marsadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userspace/marsadm b/userspace/marsadm index d2520e44..bcc747de 100755 --- a/userspace/marsadm +++ b/userspace/marsadm @@ -365,7 +365,7 @@ sub check_primary { my $lnk = "$mars/resource-$res/actual-$host/is-primary"; my $is_primary = get_link($lnk); if (!$is_primary) { # give it a second chance - my $name = get_link("$mars/resource-$res/device-$host"); + my $name = get_link("$mars/resource-$res/device-$host", 1); my $dev = "/dev/mars/$name"; $is_primary = 1 if -b $dev; } @@ -441,7 +441,7 @@ sub check_status { sub check_mars_device { my ($cmd, $res, $wait, $inv) = @_; - my $name = get_link("$mars/resource-$res/device-$host"); + my $name = get_link("$mars/resource-$res/device-$host", $inv); my $dev = "/dev/mars/$name"; my $backoff = 1; my $round = 0;