git://git.camperquake.de / zfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 613d88e)
Fix distribution detection
authorRichard Yao <ryao@cs.stonybrook.edu>
Tue, 28 Feb 2012 21:23:16 +0000 (16:23 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 5 Mar 2012 18:38:27 +0000 (10:38 -0800)
Improve the distribution detection by moving the tests for
distribution specific files first.  The Ubuntu and Debian
checks are left for last because they are the least likely
to be unique.  This is particularly true in the case of Debian
since so many distributions are based on Debian.

Since this is currently only used to identify the correct
packaging method for this system the result in many instances
is simply cosmetic.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
config/zfs-build.m4 patch | blob | history
configure patch | blob | history

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 823f332..c5983d3 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -226,24 +226,26 @@ dnl # package type for 'make pkg': (rpm | deb | tgz)
 dnl #
 AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
        AC_MSG_CHECKING([linux distribution])
-       if test -f /etc/redhat-release ; then
-               VENDOR=redhat ;
+       if test -f /etc/toss-release ; then
+               VENDOR=toss ;
        elif test -f /etc/fedora-release ; then
                VENDOR=fedora ;
+       elif test -f /etc/redhat-release ; then
+               VENDOR=redhat ;
        elif test -f /etc/gentoo-release ; then
                VENDOR=gentoo ;
-       elif test -f /etc/debian_version ; then
-               VENDOR=debian ;
+       elif test -f /etc/arch-release ; then
+               VENDOR=arch ;
        elif test -f /etc/SuSE-release ; then
                VENDOR=sles ;
        elif test -f /etc/slackware-version ; then
                VENDOR=slackware ;
-       elif test -f /etc/arch-release ; then
-               VENDOR=arch ;
-       elif test -f /etc/lsb-release ; then
-               VENDOR=ubuntu ;
        elif test -f /etc/lunar.release ; then
                VENDOR=lunar ;
+       elif test -f /etc/lsb-release ; then
+               VENDOR=ubuntu ;
+       elif test -f /etc/debian_version ; then
+               VENDOR=debian ;
        else
                VENDOR= ;
        fi
@@ -252,16 +254,17 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 
        AC_MSG_CHECKING([default package type])
        case "$VENDOR" in
-               redhat)     DEFAULT_PACKAGE=rpm ;;
-               fedora)     DEFAULT_PACKAGE=rpm ;;
-               ubuntu)     DEFAULT_PACKAGE=deb ;;
-               debian)     DEFAULT_PACKAGE=deb ;;
-               sles)       DEFAULT_PACKAGE=rpm ;;
-               slackware)  DEFAULT_PACKAGE=tgz ;;
-               gentoo)     DEFAULT_PACKAGE=tgz ;;
-               lunar)      DEFAULT_PACKAGE=tgz ;;
-               arch)       DEFAULT_PACKAGE=arch;;
-               *)          DEFAULT_PACKAGE=rpm ;;
+               toss)       DEFAULT_PACKAGE=rpm  ;;
+               redhat)     DEFAULT_PACKAGE=rpm  ;;
+               fedora)     DEFAULT_PACKAGE=rpm  ;;
+               gentoo)     DEFAULT_PACKAGE=tgz  ;;
+               arch)       DEFAULT_PACKAGE=arch ;;
+               sles)       DEFAULT_PACKAGE=rpm  ;;
+               slackware)  DEFAULT_PACKAGE=tgz  ;;
+               lunar)      DEFAULT_PACKAGE=tgz  ;;
+               ubuntu)     DEFAULT_PACKAGE=deb  ;;
+               debian)     DEFAULT_PACKAGE=deb  ;;
+               *)          DEFAULT_PACKAGE=rpm  ;;
        esac
 
        AC_MSG_RESULT([$DEFAULT_PACKAGE])
@@ -278,16 +281,17 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 
        AC_MSG_CHECKING([default init script type])
        case "$VENDOR" in
+               toss)       DEFAULT_INIT_SCRIPT=redhat ;;
                redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
                fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
-               ubuntu)     DEFAULT_INIT_SCRIPT=lsb ;;
-               debian)     DEFAULT_INIT_SCRIPT=lsb ;;
-               sles)       DEFAULT_INIT_SCRIPT=lsb ;;
-               slackware)  DEFAULT_INIT_SCRIPT=lsb ;;
                gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
-               lunar)      DEFAULT_INIT_SCRIPT=lunar ;;
-               arch)       DEFAULT_INIT_SCRIPT=arch ;;
-               *)          DEFAULT_INIT_SCRIPT=lsb ;;
+               arch)       DEFAULT_INIT_SCRIPT=arch   ;;
+               sles)       DEFAULT_INIT_SCRIPT=lsb    ;;
+               slackware)  DEFAULT_INIT_SCRIPT=lsb    ;;
+               lunar)      DEFAULT_INIT_SCRIPT=lunar  ;;
+               ubuntu)     DEFAULT_INIT_SCRIPT=lsb    ;;
+               debian)     DEFAULT_INIT_SCRIPT=lsb    ;;
+               *)          DEFAULT_INIT_SCRIPT=lsb    ;;
        esac
 
        AC_MSG_RESULT([$DEFAULT_INIT_SCRIPT])
diff --git a/configure b/configure
index d63c1a1..14c1c4d 100755 (executable)
--- a/configure
+++ b/configure
@@ -11674,24 +11674,26 @@ $as_echo "$ZFS_META_LICENSE" >&6; }
 
        { $as_echo "$as_me:$LINENO: checking linux distribution" >&5
 $as_echo_n "checking linux distribution... " >&6; }
-       if test -f /etc/redhat-release ; then
-               VENDOR=redhat ;
+       if test -f /etc/toss-release ; then
+               VENDOR=toss ;
        elif test -f /etc/fedora-release ; then
                VENDOR=fedora ;
+       elif test -f /etc/redhat-release ; then
+               VENDOR=redhat ;
        elif test -f /etc/gentoo-release ; then
                VENDOR=gentoo ;
-       elif test -f /etc/debian_version ; then
-               VENDOR=debian ;
+       elif test -f /etc/arch-release ; then
+               VENDOR=arch ;
        elif test -f /etc/SuSE-release ; then
                VENDOR=sles ;
        elif test -f /etc/slackware-version ; then
                VENDOR=slackware ;
-       elif test -f /etc/arch-release ; then
-               VENDOR=arch ;
-       elif test -f /etc/lsb-release ; then
-               VENDOR=ubuntu ;
        elif test -f /etc/lunar.release ; then
                VENDOR=lunar ;
+       elif test -f /etc/lsb-release ; then
+               VENDOR=ubuntu ;
+       elif test -f /etc/debian_version ; then
+               VENDOR=debian ;
        else
                VENDOR= ;
        fi
@@ -11702,16 +11704,17 @@ $as_echo "$VENDOR" >&6; }
        { $as_echo "$as_me:$LINENO: checking default package type" >&5
 $as_echo_n "checking default package type... " >&6; }
        case "$VENDOR" in
-               redhat)     DEFAULT_PACKAGE=rpm ;;
-               fedora)     DEFAULT_PACKAGE=rpm ;;
-               ubuntu)     DEFAULT_PACKAGE=deb ;;
-               debian)     DEFAULT_PACKAGE=deb ;;
-               sles)       DEFAULT_PACKAGE=rpm ;;
-               slackware)  DEFAULT_PACKAGE=tgz ;;
-               gentoo)     DEFAULT_PACKAGE=tgz ;;
-               lunar)      DEFAULT_PACKAGE=tgz ;;
-               arch)       DEFAULT_PACKAGE=arch;;
-               *)          DEFAULT_PACKAGE=rpm ;;
+               toss)       DEFAULT_PACKAGE=rpm  ;;
+               redhat)     DEFAULT_PACKAGE=rpm  ;;
+               fedora)     DEFAULT_PACKAGE=rpm  ;;
+               gentoo)     DEFAULT_PACKAGE=tgz  ;;
+               arch)       DEFAULT_PACKAGE=arch ;;
+               sles)       DEFAULT_PACKAGE=rpm  ;;
+               slackware)  DEFAULT_PACKAGE=tgz  ;;
+               lunar)      DEFAULT_PACKAGE=tgz  ;;
+               ubuntu)     DEFAULT_PACKAGE=deb  ;;
+               debian)     DEFAULT_PACKAGE=deb  ;;
+               *)          DEFAULT_PACKAGE=rpm  ;;
        esac
 
        { $as_echo "$as_me:$LINENO: result: $DEFAULT_PACKAGE" >&5
@@ -11732,16 +11735,17 @@ $as_echo "$DEFAULT_INIT_DIR" >&6; }
        { $as_echo "$as_me:$LINENO: checking default init script type" >&5
 $as_echo_n "checking default init script type... " >&6; }
        case "$VENDOR" in
+               toss)       DEFAULT_INIT_SCRIPT=redhat ;;
                redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
                fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
-               ubuntu)     DEFAULT_INIT_SCRIPT=lsb ;;
-               debian)     DEFAULT_INIT_SCRIPT=lsb ;;
-               sles)       DEFAULT_INIT_SCRIPT=lsb ;;
-               slackware)  DEFAULT_INIT_SCRIPT=lsb ;;
                gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
-               lunar)      DEFAULT_INIT_SCRIPT=lunar ;;
-               arch)       DEFAULT_INIT_SCRIPT=arch ;;
-               *)          DEFAULT_INIT_SCRIPT=lsb ;;
+               arch)       DEFAULT_INIT_SCRIPT=arch   ;;
+               sles)       DEFAULT_INIT_SCRIPT=lsb    ;;
+               slackware)  DEFAULT_INIT_SCRIPT=lsb    ;;
+               lunar)      DEFAULT_INIT_SCRIPT=lunar  ;;
+               ubuntu)     DEFAULT_INIT_SCRIPT=lsb    ;;
+               debian)     DEFAULT_INIT_SCRIPT=lsb    ;;
+               *)          DEFAULT_INIT_SCRIPT=lsb    ;;
        esac
 
        { $as_echo "$as_me:$LINENO: result: $DEFAULT_INIT_SCRIPT" >&5
ZFS development branch