From 11cba90394f50e3561243c97573e6f6140ac2a2c Mon Sep 17 00:00:00 2001
From: Paul Allen <paulall@microsoft.com>
Date: Tue, 8 Mar 2016 16:16:39 -0800
Subject: [PATCH 1/2] Bump OMI and PSRP provider modules

Brings in changes to support remote connect/disconnect/reconnect.
---
 src/omi          | 2 +-
 src/omi-provider | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/omi b/src/omi
index 6e8fafe1d5..3b24543f61 160000
--- a/src/omi
+++ b/src/omi
@@ -1 +1 @@
-Subproject commit 6e8fafe1d5cd099fce70979068c3b301ae383b6f
+Subproject commit 3b24543f61b42dc47ec3f3eb83ef7e2a48e171f0
diff --git a/src/omi-provider b/src/omi-provider
index 68a9f8ae76..d9b7fde13e 160000
--- a/src/omi-provider
+++ b/src/omi-provider
@@ -1 +1 @@
-Subproject commit 68a9f8ae76a8a2dfe530fa4174f717b567e456fd
+Subproject commit d9b7fde13e159016f505081603a5f67bcd2b4871

From b32d6816b96c28c534c3b6b86a22e8815df58f6c Mon Sep 17 00:00:00 2001
From: Paul Allen <paulall@microsoft.com>
Date: Tue, 8 Mar 2016 16:17:37 -0800
Subject: [PATCH 2/2] Update OMI and PSRP scripts

- `omibuild.sh` now configures CMake in Debug mode
- `psrp.sh` no longer uses LLDB; now runs under `sudo`
---
 omibuild.sh | 10 +++++-----
 psrp.sh     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/omibuild.sh b/omibuild.sh
index f901b38067..756b995dce 100755
--- a/omibuild.sh
+++ b/omibuild.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 # Build OMI
-cd src/omi/Unix
+pushd src/omi/Unix
 ./configure --dev
 make -j
-cd ../../..
+popd
 
 # Build the OMI Provider
-cd src/omi-provider
-cmake .
+pushd src/omi-provider
+cmake -DCMAKE_BUILD_TYPE=Debug .
 make -j
-cd ../..
+popd
diff --git a/psrp.sh b/psrp.sh
index 090a11c67c..eb42adc067 100755
--- a/psrp.sh
+++ b/psrp.sh
@@ -1,2 +1,2 @@
 export CORE_ROOT=$(pwd)/bin
-lldb-3.6 -o "plugin load ./bin/libsosplugin.so" -- ./src/omi/Unix/output/bin/omiserver --ignoreAuthentication -l --loglevel 2
+sudo -E ./src/omi/Unix/output/bin/omiserver -l --loglevel 2