From: S.Çağlar Onur <caglar@verivue.com>
Date: Mon, 21 Mar 2011 16:58:36 +0000 (-0400)
Subject: merge from master
X-Git-Tag: bootcd-4.2-25~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a5140ad604c1cf2aa2a5e3d21a95f50ffe079744;p=bootcd.git

merge from master
---

diff --git a/bootcd.spec b/bootcd.spec
index b5c8116..676d6cf 100644
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 
 Requires: dosfstools, mkisofs, gzip, mtools, syslinux
+# yumdownloader is needed in bootcd-kernel
+Requires: yum-utils
 
 Requires: pyplnet
 
diff --git a/kvariant.sh b/kvariant.sh
index dc80128..bbd0e46 100755
--- a/kvariant.sh
+++ b/kvariant.sh
@@ -53,13 +53,13 @@ kernelrpm_url=$1; shift
 
 basedir=$(cd -P $(dirname $0); pwd)
 standard_path="$basedir/build"
-if [ ! -d $standard_path ] ; then
+if [ ! -d "$standard_path" ] ; then
     echo "Cound not find standard image $standard_path - exiting"
     exit 1
 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