diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 10:53:47 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 10:53:47 +0000 |
| commit | bebaf0fc16f62691e9b05a939cb83947f4c5e415 (patch) | |
| tree | c8ed30fa9e34b80f33de81b4043c6ce5b5421940 | |
| parent | 31619da69c9e692f006db273d95d20ae279a7d39 (diff) | |
Change scripts/os-type so that when "uname -s" returns just "GNU", the
answer is "GNU", and only if the return is "GNU/something" is the answer
"Linux".
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rwxr-xr-x | src/scripts/os-type | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 570e23a41..db1162f26 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.112 2005/04/06 10:06:14 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.113 2005/04/06 10:53:47 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -154,6 +154,10 @@ PH/25 When debugging is enabled, the contents of the command line are added to the debugging output, even when log_selector=+arguments is not specified. +PH/26 Change scripts/os-type so that when "uname -s" returns just "GNU", the + answer is "GNU", and only if the return is "GNU/something" is the answer + "Linux". + A note about Exim versions 4.44 and 4.50 ---------------------------------------- diff --git a/src/scripts/os-type b/src/scripts/os-type index 31b5bfcd7..60d1730df 100755 --- a/src/scripts/os-type +++ b/src/scripts/os-type @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/scripts/os-type,v 1.2 2005/02/17 10:04:41 ph10 Exp $ +# $Cambridge: exim/src/scripts/os-type,v 1.3 2005/04/06 10:53:47 ph10 Exp $ # Shell script to determine the operating system type. Some of the heuristics # herein have accumulated over the years and may not strictly be needed now, @@ -23,7 +23,8 @@ case "$os" in '') os=`uname -s`;; esac # Identify Glibc systems under different names. -case "$os" in GNU|GNU/*|Linux) os=Linux;; esac +case "$os" in GNU) os=GNU;; esac +case "$os" in GNU/*|Linux) os=Linux;; esac # It is believed that all systems respond to uname -s, but just in case # there is one that doesn't, use the shell's $OSTYPE variable. It is known @@ -149,9 +150,9 @@ Linux) if [ -L /usr/lib/libc.so ]; then # ELF soon. NetBSD) if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ ; then - # Non-ELF system - os="NetBSD-a.out" - fi + # Non-ELF system + os="NetBSD-a.out" + fi ;; esac |