diff options
Diffstat (limited to 'sntp/scripts')
| -rw-r--r-- | sntp/scripts/Makefile.in | 2 | ||||
| -rwxr-xr-x | sntp/scripts/cvo.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sntp/scripts/Makefile.in b/sntp/scripts/Makefile.in index 42d86ecb59d3..4ad3e371b4e1 100644 --- a/sntp/scripts/Makefile.in +++ b/sntp/scripts/Makefile.in @@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_compiler.m4 \ $(top_srcdir)/m4/ntp_crosscompile.m4 \ + $(top_srcdir)/m4/ntp_crypto_rand.m4 \ $(top_srcdir)/m4/ntp_debug.m4 $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_facilitynames.m4 \ $(top_srcdir)/m4/ntp_harden.m4 $(top_srcdir)/m4/ntp_ipv6.m4 \ @@ -290,6 +291,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_OPENSSL = @PATH_OPENSSL@ PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ diff --git a/sntp/scripts/cvo.sh b/sntp/scripts/cvo.sh index ecd80922301f..77a161172499 100755 --- a/sntp/scripts/cvo.sh +++ b/sntp/scripts/cvo.sh @@ -26,7 +26,13 @@ case "$#" in CVO_OS=$4 case "$cvo_KERN" in linux) # Braindamage. We want OS, not kernel info - if lsb_release > /dev/null 2>&1 + if test -f /etc/os-release + then + . /etc/os-release + ID=`echo $ID | tr '-' '_'` + CVO_OS="${ID}${VERSION_ID}" + CVO_KOSVER=`uname -r` + elif lsb_release > /dev/null 2>&1 then CVO_OS=`lsb_release --id --short | tr '[:upper:]' '[:lower:]'` CVO_OS="$CVO_OS`lsb_release --release --short`" |