diff options
| author | Prakash Surya <[email protected]> | 2011-12-16 22:32:54 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-12-19 12:05:10 -0800 |
| commit | 8eaa020b46e80b09cc5f924b90809e219ce08e75 (patch) | |
| tree | 81bf94390a3a16f8e158cfb13872adb3530b61f3 | |
| parent | afd7da0ce72c3b3554079644d73e90fe6d2bf955 (diff) | |
Move Arch Linux's VENDOR check above Ubuntu's
If the lsb-release package is installed on an Arch Linux distribution,
the configure step will incorrectly detect the running distribution as
Ubuntu. This is a result of both distributions providing an
/etc/lsb-release file, and the Ubuntu VENDOR check being performed
first.
Since the Arch Linux test check's for a file more specific to the Arch
Linux distribution, moving Arch Linux's VENDOR check above Unbuntu's
check provides a quick and easy solution.
Signed-off-by: Prakash Surya <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | config/zfs-build.m4 | 4 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 597713139..b6a1800be 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -234,12 +234,12 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ 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/arch-release ; then - VENDOR=arch ; else VENDOR= ; fi @@ -11859,12 +11859,12 @@ $as_echo_n "checking linux distribution... " >&6; } 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/arch-release ; then - VENDOR=arch ; else VENDOR= ; fi |