[Bug 1644] from 4.2.6p3: cvo.sh doesn't handle some unstable/testing linux distros

bk: 4ca02c23H0sra9O_FbNMRAVxu0tOMg

diff --git a/ChangeLog b/ChangeLog
index d2f219af75d4594079fa99b254d777dc209d3a6d..cf11cfdcd10ea2ab458969d2373a82edf7c059c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1644] from 4.2.6p3: cvo.sh doesn't handle some unstable/testing
+  linux distros.
 * Documentation updates from Dave Mills.
 (4.2.7p56) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>
 * Clock combining algorithm improvements from Dave Mills.

diff --git a/scripts/cvo.sh b/scripts/cvo.sh
index e0932bf6a78c8848fb133cae701cbcbb568fac70..a8d00ef6cb4f5eb024bf2fecbfe4713c244dabab 100755 (executable)
--- 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`