From 4b0d6334d1928d82fb9547ff8007e87cc4152a97 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 5 Sep 2018 10:29:39 -0400
Subject: [PATCH] Make sure that the beadm backend can run if beadm is in base

---
 src/server/WebBackend.cpp           | 2 +-
 src/server/library/sysadm-beadm.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 711074b..fd90c20 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -42,7 +42,7 @@ RestOutputStruct::ExitCode WebSocket::AvailableSubsystems(bool allaccess, QJsonO
   out->insert("rpc/logs", allaccess ? "read/write" : "read");
 
   // - beadm
-  if(QFile::exists("/usr/local/sbin/beadm")){
+  if(QFile::exists("/usr/local/sbin/beadm") || QFile::exists("/sbin/beadm") ){
     out->insert("sysadm/beadm", "read/write");
   }
 
diff --git a/src/server/library/sysadm-beadm.cpp b/src/server/library/sysadm-beadm.cpp
index 3a1893d..ffaf039 100644
--- a/src/server/library/sysadm-beadm.cpp
+++ b/src/server/library/sysadm-beadm.cpp
@@ -52,7 +52,7 @@ QJsonObject BEADM::listBEs() {
 
   QJsonObject BEADM::renameBE(QJsonObject jsin) {
   QJsonObject retObject;
-  
+
   QStringList keys = jsin.keys();
   if (! keys.contains("source") || ! keys.contains("target") ) {
     retObject.insert("error", "Missing required key(s) 'source / target'");
@@ -71,7 +71,7 @@ QJsonObject BEADM::listBEs() {
       return retObject;
     }
   }
-  
+
   retObject.insert("source", source);
   retObject.insert("target", target);
   return retObject;
@@ -191,7 +191,7 @@ QJsonObject BEADM::listBEs() {
   QString mountpoint;
   if (keys.contains("mountpoint") ) {
     mountpoint = jsin.value("mountpoint").toString();
-  }	
+  }
 
   QStringList output = General::RunCommand("beadm mount "+ be + " " + mountpoint).split("\n");
 
@@ -209,7 +209,7 @@ QJsonObject BEADM::listBEs() {
 
   return retObject;
  }
- 
+
  //  Unmount the given boot environment immediately.  Confirmation should be done through the client.
 
 QJsonObject BEADM::umountBE(QJsonObject jsin) {