aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-07 03:23:45 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-07 03:23:45 -0500
commit55d82df3848d29f537278a7117b7926fa074754e (patch)
tree6ae2bd8023382fb2b6db239da41cba96cc8e4866
parent2079d758286968a78fe4a923e583550451148f1f (diff)
restore bsd messages
-rw-r--r--Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs2
-rw-r--r--MediaBrowser.Model/System/IEnvironmentInfo.cs3
-rw-r--r--MediaBrowser.Server.Mono/Program.cs13
3 files changed, 16 insertions, 2 deletions
diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index dcc974413..5da1ae2dc 100644
--- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -12,7 +12,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
public MediaBrowser.Model.System.Architecture? CustomArchitecture { get; set; }
public MediaBrowser.Model.System.OperatingSystem? CustomOperatingSystem { get; set; }
- public MediaBrowser.Model.System.OperatingSystem OperatingSystem
+ public virtual MediaBrowser.Model.System.OperatingSystem OperatingSystem
{
get
{
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index abe39fa03..2c57df97c 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -17,6 +17,7 @@ namespace MediaBrowser.Model.System
{
Windows,
Linux,
- OSX
+ OSX,
+ BSD
}
}
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 8100dec8d..4790378a9 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -319,5 +319,18 @@ namespace MediaBrowser.Server.Mono
{
return Syscall.getuid().ToString(CultureInfo.InvariantCulture);
}
+
+ public override Model.System.OperatingSystem OperatingSystem
+ {
+ get
+ {
+ if (IsBsd)
+ {
+ return Model.System.OperatingSystem.BSD;
+ }
+
+ return base.OperatingSystem;
+ }
+ }
}
}