From: Stefan Berger Subject: [PATCH] Fix for ACM script Date: Mon, 17 Apr 2006 07:23:14 -0400 Message-ID: <1145272994.6570.1.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-nkCXpwhQ3fkPCzDlJP9C" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: ewan@xensource.com List-Id: xen-devel@lists.xenproject.org --=-nkCXpwhQ3fkPCzDlJP9C Content-Type: text/plain Content-Transfer-Encoding: 7bit This fixes a path problem with the current ACM scripts. Signed-off-by: Stefan Berger --=-nkCXpwhQ3fkPCzDlJP9C Content-Disposition: attachment; filename=acm-script-fix.diff Content-Type: text/x-patch; name=acm-script-fix.diff; charset=UTF-8 Content-Transfer-Encoding: 7bit Index: root/xen-unstable.hg/tools/security/labelfuncs.sh =================================================================== --- root.orig/xen-unstable.hg/tools/security/labelfuncs.sh +++ root/xen-unstable.hg/tools/security/labelfuncs.sh @@ -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$" } Index: root/xen-unstable.hg/tools/security/updategrub.sh =================================================================== --- root.orig/xen-unstable.hg/tools/security/updategrub.sh +++ root/xen-unstable.hg/tools/security/updategrub.sh @@ -41,8 +41,8 @@ Usage: $prg [-d ] : The name of the policy, i.e. xen_null : 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' " } --=-nkCXpwhQ3fkPCzDlJP9C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-nkCXpwhQ3fkPCzDlJP9C--