From 2dc1237cc392cc87a3c515897950e8eea96121d4 Mon Sep 17 00:00:00 2001
From: Manuel Franceschini <livewire@google.com>
Date: Fri, 3 Sep 2010 14:10:07 +0200
Subject: [PATCH] Log warning instead of raising OpExecError for ndisc6
Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/backend.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/backend.py b/lib/backend.py
index 2e9e34a2c..bdb4b0050 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -306,7 +306,11 @@ def StartMaster(start_daemons, no_voting):
utils.RunCmd(["arping", "-q", "-U", "-c 3", "-I", master_netdev, "-s",
master_ip, master_ip])
elif ipcls == netutils.IP6Address:
- utils.RunCmd(["ndisc6", "-q", "-r 3", master_ip, master_netdev])
+ try:
+ utils.RunCmd(["ndisc6", "-q", "-r 3", master_ip, master_netdev])
+ except errors.OpExecError:
+ # TODO: Better error reporting
+ logging.warning("Can't execute ndisc6, please install if missing")
if err_msgs:
_Fail("; ".join(err_msgs))
--
GitLab