From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 25 Jan 2011 15:55:04 +0000 (-0500)
Subject: Revert "previous commit requires lots of changes in other modules so introduce a... 
X-Git-Tag: bootcd-4.2-20~2
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=10289ab1aeab7f9cef4e88c5a2fa4d6af651d183

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

This reverts commit 9fad43f5f4984e781b9ea37360759f3648e770a2.
---

diff --git a/kvariant.sh b/kvariant.sh
index adb8087..2613fa9 100755
--- a/kvariant.sh
+++ b/kvariant.sh
@@ -49,6 +49,9 @@ 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)
@@ -73,8 +76,7 @@ kernelrpm=$variant_path/$(basename $kernelrpm_url)
 getrpm $kernelrpm_url $kernelrpm
 checkrpm $kernelrpm
 
-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"`
+if [ -n "$extrarpm_url" ] ; then
     extrarpm=$variant_path/$(basename $extrarpm_url)
     getrpm $extrarpm_url $extrarpm
     checkrpm $extrarpm