From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 18 Jan 2011 21:19:58 +0000 (-0500)
Subject: previous commit requires lots of changes in other modules so introduce a quick hack... 
X-Git-Tag: bootcd-5.0-7~1
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=cd07242d54498d34d6747e6d0bfd8031f41f282f

previous commit requires lots of changes in other modules so introduce a quick hack for now
---

diff --git a/kvariant.sh b/kvariant.sh
index 2613fa9..adb8087 100755
--- a/kvariant.sh
+++ b/kvariant.sh
@@ -49,9 +49,6 @@ set -e
 variant=$1; shift
 [[ -z "$@" ]] && usage
 kernelrpm_url=$1; shift
-if [[ -n "$@" ]] ; then
-    extrarpm_url=$1; shift
-fi
 [[ -n "$@" ]] && usage
 
 basedir=$(cd -P $(dirname $0); pwd)
@@ -76,7 +73,8 @@ kernelrpm=$variant_path/$(basename $kernelrpm_url)
 getrpm $kernelrpm_url $kernelrpm
 checkrpm $kernelrpm
 
-if [ -n "$extrarpm_url" ] ; then
+if echo ${kernelrpm} | grep -q kernel-2.6.32 ; then
+    extrarpm_url=`echo $kernelrpm_url | sed -e "s:kernel-2.6.32:kernel-firmware-2.6.32:g"`
     extrarpm=$variant_path/$(basename $extrarpm_url)
     getrpm $extrarpm_url $extrarpm
     checkrpm $extrarpm