Set exec label of dotnet-launcher to "User"

To attach diagnostics process to app process, exec label should be set to "User".
Additionally, log redirection (to dlog) is turned off for corerun mode.

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
index ec595ae..aa8a8e9 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
@@ -311,6 +311,11 @@ CoreRuntime::CoreRuntime(const char* mode) :
        }
 }
 
+void CoreRuntime::setLogManager(bool enable)
+{
+       __enableLogManager = enable;
+}
+
 CoreRuntime::~CoreRuntime()
 {
        // workaround : to prevent crash while process terminate on profiling mode,

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.h b/NativeLauncher/launcher/dotnet/dotnet_launcher.h
index 704070b..b7511e5 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.h
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.h
@@ -33,6 +33,7 @@ class CoreRuntime
                int initialize(bool standalone);
                void dispose();
                int launch(const char* appId, const char* root, const char* path, int argc, char* argv[]);
+               void setLogManager(bool enable);
 
        private:
 
@@ -51,6 +52,7 @@ class CoreRuntime
                bool __initialized;
                bool __enableLogManager;
                bool __isProfileMode;
+
 };
 
 }  // dotnetcore

diff --git a/NativeLauncher/launcher/main.cc b/NativeLauncher/launcher/main.cc
index f09705b..ced3220 100644 (file)
--- a/NativeLauncher/launcher/main.cc
+++ b/NativeLauncher/launcher/main.cc
@@ -84,6 +84,9 @@ extern "C" int realMain(int argc, char *argv[], const char* mode)
                snprintf(appId, 16, "%s", "dotnet-launcher");
                appRoot = baseName(argv[1]);
 
+               // diable log redirection to dlog.
+               runtime->setLogManager(false);
+
                if (runtime->initialize(true) != 0) {
                        _ERR("Failed to initialize");
                        return 1;

diff --git a/dotnet-launcher.manifest b/dotnet-launcher.manifest
index 0f2e9fc..f02c64c 100644 (file)
--- a/dotnet-launcher.manifest
+++ b/dotnet-launcher.manifest
@@ -4,5 +4,6 @@
     </request>
     <assign>
         <filesystem path="/opt/usr/dotnet" label="System::Shared" type="transmutable" />
+        <filesystem path="/usr/bin/dotnet-launcher" exec_label="User" />
     </assign>
 </manifest>