From: Kefu Chai <kchai@redhat.com>
Date: Mon, 18 Sep 2017 04:57:29 +0000 (+0800)
Subject: common/util: do not print error if VERSION_ID is missing
X-Git-Tag: v12.2.5~52^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46401fcd859ba388e3972da840f8679d8cbb2564;p=ceph.git

common/util: do not print error if VERSION_ID is missing

per os-release(5), VERSION_ID is optional.

Fixes: http://tracker.ceph.com/issues/23477
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit eff4961f4608384519aca0918e8ab9c7ac650f32)
---

diff --git a/src/common/util.cc b/src/common/util.cc
index 4f31b932faa4..f96de189b135 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -182,7 +182,7 @@ static void distro_detect(map<string, string> *m, CephContext *cct)
     lderr(cct) << "distro_detect - /etc/os-release is required" << dendl;
   }
 
-  for (const char* rk: {"distro", "distro_version"}) {
+  for (const char* rk: {"distro", "distro_description"}) {
     if (m->find(rk) == m->end())
       lderr(cct) << "distro_detect - can't detect " << rk << dendl;
   }