Re: [LTP] [PATCH] Filecaps: Update error message for recent kernels

[Matt Helsley <matthltc@us.ibm.com>]

On Tue, Sep 15, 2009 at 05:30:55PM +0200, Geert Uytterhoeven wrote:
>    - As of 2.6.24, `capability' can no longer be a module,
>    - As of 2.6.27, CONFIG_SECURITY_CAPABILITIES no longer exists.
> 
> Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> ---
>  .../kernel/security/filecaps/checkforfilecaps.sh   |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/security/filecaps/checkforfilecaps.sh b/testcases/kernel/security/filecaps/checkforfilecaps.sh
> index 20f97f5..3f6a4ec 100755
> --- a/testcases/kernel/security/filecaps/checkforfilecaps.sh
> +++ b/testcases/kernel/security/filecaps/checkforfilecaps.sh
> @@ -23,8 +23,7 @@ check_simple_capset
>  ret=$?
>  if [ $ret -ne 0 ]; then
>  	echo Posix capabilities not compiled into the kernel.  Please
> -	echo modprobe capability or recompile your kernel with
> -	echo CONFIG_SECURITY_CAPABILITIES=y.
> +	echo recompile your kernel with CONFIG_SECURITY_FILE_CAPABILITIES=y.

Then the advice is incorrect for older kernels. If LTP should still run
nicely for users of older kernels then perhaps something like this is better:

-	echo modprobe capability or recompile your kernel with
-	echo CONFIG_SECURITY_CAPABILITIES=y.
+	if tst_kvercmp 2 6 24 ; then
+		echo modprobe capability or recompile your kernel with
+		echo CONFIG_SECURITY_CAPABILITIES=y.
+	elif tst_kvercmp 2 6 27 ; then
+		echo recompile your kernel with CONFIG_SECURITY_CAPABILITIES=y.
+	else
+		echo recompile your kernel with CONFIG_SECURITY_FILE_CAPABILITIES=y.
+	fi

Cheers,
	-Matt Helsley

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list