From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 25 Jan 2011 15:53:31 +0000 (-0500)
Subject: Revert "add optional 3rd argument to support additional packages, ex;"
X-Git-Tag: bootcd-5.0-8~1
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=11ecd715bb72ffe378b45926e70bdac3284b1463

Revert "add optional 3rd argument to support additional packages, ex;"

This reverts commit c332e5a1cdea2efa7ddd43a08a1dd7fe3c414054.
---

diff --git a/kvariant.sh b/kvariant.sh
index 2613fa9..dc80128 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,12 +73,6 @@ kernelrpm=$variant_path/$(basename $kernelrpm_url)
 getrpm $kernelrpm_url $kernelrpm
 checkrpm $kernelrpm
 
-if [ -n "$extrarpm_url" ] ; then
-    extrarpm=$variant_path/$(basename $extrarpm_url)
-    getrpm $extrarpm_url $extrarpm
-    checkrpm $extrarpm
-fi
-
 isofsdir=$variant_path/isofs
 
 tmpdir=
@@ -99,10 +90,6 @@ rm -rf boot/*
 rm -rf lib/modules
 echo "Replacing with new kernel"
 rpm2cpio  $kernelrpm | cpio -diu
-if [ -n $"extrarpm_url" ] ; then
-    echo "Unpacking $extrarpm"
-    rpm2cpio  $extrarpm | cpio -diu
-fi
 echo "Running depmod"
 version=$(cd ./boot && ls vmlinuz* | sed 's,vmlinuz-,,')
 depmod -b . $version
@@ -128,7 +115,7 @@ mv ${tmpdir}/bootcd.img ${isofsdir}/bootcd.img
 echo -n " bootcd.img"
 echo ""
 
-rm -rf $tmpdir $kernelrpm $extrarpm
+rm -rf $tmpdir $kernelrpm
 
 echo "new variant $variant ready"
 trap - ERR