Skip to content

Commit

Permalink
Move Arch Linux's VENDOR check above Ubuntu's
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Prakash Surya authored and behlendorf committed Dec 19, 2011
1 parent afd7da0 commit 8eaa020
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config/zfs-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8eaa020

Please sign in to comment.