From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 30 Sep 2010 04:14:03 +0000 (-0400)
Subject: [Bug 1644]: cvo.sh should use lsb_release to identify linux distros.
X-Git-Tag: NTP_4_2_7P58~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db0d4da0fc8e17ca2109f576b67cd8b44a87b205;p=thirdparty%2Fntp.git

[Bug 1644]: cvo.sh should use lsb_release to identify linux distros.

bk: 4ca40e8biwQo4SmDrxeoezP0NeLHfw
---

diff --git a/ChangeLog b/ChangeLog
index e405a336c..2b0538378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
+
 * [Bug 1643]: Range-check the decoding of the RIPE-NCC status codes.
+* [Bug 1644]: cvo.sh should use lsb_release to identify linux distros.
 
 ---
 (4.2.6p3-RC2) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/scripts/cvo.sh b/scripts/cvo.sh
index e0932bf6a..a8d00ef6c 100755
--- a/scripts/cvo.sh
+++ b/scripts/cvo.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright 2002, 2009, Harlan Stenn.  Used by NTP with permission.
+# Copyright 2002, 2009, 2010 Harlan Stenn.  Used by NTP with permission.
 # Author: Harlan Stenn <harlan+cvo@pfcs.com>
 
 # Possible output formats:
@@ -26,9 +26,10 @@ case "$#" in
     CVO_OS=$4
     case "$cvo_KERN" in
      linux)			# Braindamage.  We want OS, not kernel info
-	if false
+	if lsb_release > /dev/null 2>&1
 	then
-	    :
+	    CVO_OS=`lsb_release --id --short | tr '[:upper:]' '[:lower:]'`
+	    CVO_OS="$CVO_OS`lsb_release --release --short`"
 	elif test -f /etc/debian_version
 	then
 	    set `cat /etc/debian_version`