X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kvariant.sh;h=d8fde68abba2b212ce7d6435ca8c8dead0a46f1d;hb=5db77cd2ee7f704b733091b223844d5b6b55dc9c;hp=2613fa9597e443d075033b7ba181b280115c5ac8;hpb=c332e5a1cdea2efa7ddd43a08a1dd7fe3c414054;p=bootcd.git

diff --git a/kvariant.sh b/kvariant.sh
index 2613fa9..d8fde68 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)
@@ -62,7 +59,7 @@ if [ ! -d $standard_path ] ; then
 fi
 
 variant_path="$basedir/$variant"
-if [ -e $variant_path ] ; then
+if [ -e "$variant_path" ] ; then
     echo "Found $variant_path - please remove first - exiting"
     exit 1
 fi
@@ -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