From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Wed, 20 Sep 2017 11:50:02 -0400
Subject: [PATCH] SERVER-30857 Support unknown Linux distributions

---
 src/mongo/rpc/metadata/client_metadata.cpp | 6 ------
 src/mongo/util/processinfo_linux.cpp       | 9 ++++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp
index 845a315dd74..a959a4e31e9 100644
--- a/src/mongo/rpc/metadata/client_metadata.cpp
+++ b/src/mongo/rpc/metadata/client_metadata.cpp
@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData driverName,
                                       StringData osArchitecture,
                                       StringData osVersion,
                                       BSONObjBuilder* builder) {
-    invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() &&
-              !osArchitecture.empty() && !osVersion.empty());
-
     BSONObjBuilder metaObjBuilder(builder->subobjStart(kMetadataDocumentName));
 
     {
@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData driverName,
                                         StringData osVersion,
                                         StringData appName,
                                         BSONObjBuilder* builder) {
-    invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() &&
-              !osArchitecture.empty() && !osVersion.empty());
-
     if (appName.size() > kMaxApplicationNameByteLength) {
         return Status(ErrorCodes::ClientMetadataAppNameTooLarge,
                       str::stream() << "The '" << kApplication << "." << kName
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index c3debf377bd..c2813b026b0 100644
--- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp
@@ -376,10 +376,13 @@ class LinuxSysHelper {
             if ((nl = name.find('\n', nl)) != string::npos)
                 // stop at first newline
                 name.erase(nl);
-            // no standard format for name and version.  use kernel version
-            version = "Kernel ";
-            version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
+        } else {
+            name = "unknown";
         }
+
+        // There is no standard format for name and version so use the kernel version.
+        version = "Kernel ";
+        version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
     }
 
     /**
t-env.in?id=d7965b58d25c9c7648ba5682223f32d759fdffda'>build: Remove references to the 'nix-hash' program.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=82f903e70f580c34503052245625354d2f097d7e'>daemon: Remove 'NIX_LIBEXEC_DIR'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=bc69ea2d605810cc32e13ed03d5848b8dc358b61'>daemon: Run 'guix offload' directly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=2e3e5d21988fc2cafb2a9eaf4b00976ea425629d'>daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 16:20:01 +0100'>2019-02-04</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=959eaa1eb834fd47ceab3c5bbbe4967e808d530b'>daemon: Add "/guix" to default 'nixLibexecDir'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 16:20:01 +0100'>2019-02-04</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=4d4a38f620520acc787ff5db2be3736923e14235'>daemon: Remove the 'NIX_SUBSTITUTERS' environment variable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>