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 <surya1@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
afd7da0ce7
commit
8eaa020b46
|
@ -234,12 +234,12 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
|
||||||
VENDOR=sles ;
|
VENDOR=sles ;
|
||||||
elif test -f /etc/slackware-version ; then
|
elif test -f /etc/slackware-version ; then
|
||||||
VENDOR=slackware ;
|
VENDOR=slackware ;
|
||||||
|
elif test -f /etc/arch-release ; then
|
||||||
|
VENDOR=arch ;
|
||||||
elif test -f /etc/lsb-release ; then
|
elif test -f /etc/lsb-release ; then
|
||||||
VENDOR=ubuntu ;
|
VENDOR=ubuntu ;
|
||||||
elif test -f /etc/lunar.release ; then
|
elif test -f /etc/lunar.release ; then
|
||||||
VENDOR=lunar ;
|
VENDOR=lunar ;
|
||||||
elif test -f /etc/arch-release ; then
|
|
||||||
VENDOR=arch ;
|
|
||||||
else
|
else
|
||||||
VENDOR= ;
|
VENDOR= ;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -11859,12 +11859,12 @@ $as_echo_n "checking linux distribution... " >&6; }
|
||||||
VENDOR=sles ;
|
VENDOR=sles ;
|
||||||
elif test -f /etc/slackware-version ; then
|
elif test -f /etc/slackware-version ; then
|
||||||
VENDOR=slackware ;
|
VENDOR=slackware ;
|
||||||
|
elif test -f /etc/arch-release ; then
|
||||||
|
VENDOR=arch ;
|
||||||
elif test -f /etc/lsb-release ; then
|
elif test -f /etc/lsb-release ; then
|
||||||
VENDOR=ubuntu ;
|
VENDOR=ubuntu ;
|
||||||
elif test -f /etc/lunar.release ; then
|
elif test -f /etc/lunar.release ; then
|
||||||
VENDOR=lunar ;
|
VENDOR=lunar ;
|
||||||
elif test -f /etc/arch-release ; then
|
|
||||||
VENDOR=arch ;
|
|
||||||
else
|
else
|
||||||
VENDOR= ;
|
VENDOR= ;
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue