From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 26 Jun 2009 19:28:19 +0000 (+0000)
Subject: Work with multiple BootCD setups.
X-Git-Tag: BootCD-4.2-14~2
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=e0bfe60c89848b001e171ef8aade763d30fa2136

Work with multiple BootCD setups.
---

diff --git a/kvariant.sh b/kvariant.sh
index f369d28..dc80128 100755
--- a/kvariant.sh
+++ b/kvariant.sh
@@ -51,13 +51,14 @@ variant=$1; shift
 kernelrpm_url=$1; shift
 [[ -n "$@" ]] && usage
 
-standard_path="/usr/share/bootcd/build"
+basedir=$(cd -P $(dirname $0); pwd)
+standard_path="$basedir/build"
 if [ ! -d $standard_path ] ; then
     echo "Cound not find standard image $standard_path - exiting"
     exit 1
 fi
 
-variant_path=/usr/share/bootcd/$variant
+variant_path="$basedir/$variant"
 if [ -e $variant_path ] ; then
     echo "Found $variant_path - please remove first - exiting"
     exit 1
@@ -114,7 +115,7 @@ mv ${tmpdir}/bootcd.img ${isofsdir}/bootcd.img
 echo -n " bootcd.img"
 echo ""
 
-rm -rf $tmpdir
+rm -rf $tmpdir $kernelrpm
 
 echo "new variant $variant ready"
 trap - ERR