Fix for ACM script
PATCH 1/1 Fix for ACM script
This fixes a path problem with the current ACM scripts.
Signed-off-by Stefan Berger <[email protected]>
xen-unstable.hg/tools/security/labelfuncs.sh +6 -6
@@ -147,23 +147,23 @@ findGrubConf() # will hold a pattern # Parameters: # 1st: the path to reach the root directory of the XEN build tree -# where linux-*-xen0 is located at +# where linux-*-xen is located at # Results: # The variable linux holds then name and version of the compiled -# kernel, i.e., 'vmlinuz-2.6.12-xen0' +# kernel, i.e., 'vmlinuz-2.6.12-xen' getLinuxVersion () { local path local versionfile local lnx if [ "$1" == "" ]; then - path="/lib/modules/*-xen0" + path="/lib/modules/*-xen" else path="/lib/modules/$1" fi linux="" - for f in $path/linux-*-xen0 ; do + for f in $path ; do versionfile=$f/build/include/linux/version.h if [ -r $versionfile ]; then lnx=`cat $versionfile | \
@@ -178,7 +178,7 @@ getLinuxVersion () numbers[2], \ numbers[3]); \ } else { \ - printf("%s.%s.%s[.0-9]*-xen0",\ + printf("%s.%s.%s[.0-9]*-xen", \ numbers[1], \ numbers[2], \ numbers[3]); \
@@ -192,7 +192,7 @@ getLinuxVersion () done #Last resort. - linux="vmlinuz-2.[45678].[0-9]*[.0-9]*-xen0$" + linux="vmlinuz-2.[45678].[0-9]*[.0-9]*-xen$" }
xen-unstable.hg/tools/security/updategrub.sh +2 -2
@@ -41,8 +41,8 @@ Usage: $prg [-d <policies root>] <policy default is $acmroot <policy name> : The name of the policy, i.e. xen_null <kernel version> : The version of the kernel to apply the policy - against, i.e. 2.6.12.6-xen0 - If not specified, a kernel version ending with '-xen0' + against, i.e. 2.6.16-xen + If not specified, a kernel version ending with '-xen' will be searched for in '/lib/modules' " }
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Ewan Mellor
AppliedQuoted 3 lines · Stefan Berger
This fixes a path problem with the current ACM scripts.
Signed-off-by Stefan Berger <[email protected]>
Applied, thanks.
Ewan.