Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Check sourcelink is set before passing to readlink 

When no source was found in any of the expected paths treat
this as fatal and provide the user with a hint as to what
they should do.
This commit is contained in:
Brian Behlendorf 2010-07-01 13:25:34 -07:00
parent 55f10ae5e9
commit 8fd4e3af2e
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/spl-build.m4
View File

@ -117,13 +117,14 @@ AC_DEFUN([SPL_AC_KERNEL], [
2>/dev/null | grep -v obj | tail -1)
fi
if test -e ${sourcelink}; then
if test -n "$sourcelink" && test -e ${sourcelink}; then
kernelsrc=`readlink -f ${sourcelink}`
else
AC_MSG_RESULT([Not found])
AC_MSG_ERROR([
*** Please specify the location of the kernel source
*** with the '--with-linux=PATH' option])
*** Please make sure the kernel devel package for your distribution
*** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option.])
fi
else
if test "$kernelsrc" = "NONE"; then

24
configure vendored
View File

@ -11504,17 +11504,19 @@ $as_echo_n "checking kernel source directory... " >&6; }
2>/dev/null | grep -v obj | tail -1)
fi
if test -e ${sourcelink}; then
if test -n "$sourcelink" && test -e ${sourcelink}; then
kernelsrc=`readlink -f ${sourcelink}`
else
{ $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
*** Please specify the location of the kernel source
*** with the '--with-linux=PATH' option" >&5
*** Please make sure the kernel devel package for your distribution
*** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option." >&5
$as_echo "$as_me: error:
*** Please specify the location of the kernel source
*** with the '--with-linux=PATH' option" >&2;}
*** Please make sure the kernel devel package for your distribution
*** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option." >&2;}
{ (exit 1); exit 1; }; }
fi
else
@ -14974,17 +14976,19 @@ $as_echo_n "checking kernel source directory... " >&6; }
2>/dev/null | grep -v obj | tail -1)
fi
if test -e ${sourcelink}; then
if test -n "$sourcelink" && test -e ${sourcelink}; then
kernelsrc=`readlink -f ${sourcelink}`
else
{ $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
*** Please specify the location of the kernel source
*** with the '--with-linux=PATH' option" >&5
*** Please make sure the kernel devel package for your distribution
*** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option." >&5
$as_echo "$as_me: error:
*** Please specify the location of the kernel source
*** with the '--with-linux=PATH' option" >&2;}
*** Please make sure the kernel devel package for your distribution
*** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option." >&2;}
{ (exit 1); exit 1; }; }
fi
else