attempt to fix small glitches in boot.log
Thierry Parmentelat [Wed, 16 Mar 2011 10:01:16 +0000 (11:01 +0100)]
bootcd.spec
kvariant.sh
plc.d/bootcd-kernel

index 43e9c92..dc5734d 100644 (file)
@@ -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
 
index dc80128..d8fde68 100755 (executable)
@@ -59,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
index c7d51b8..e7526fa 100755 (executable)
@@ -23,7 +23,7 @@ case "$1" in
                pushd $i
                basearch=$(echo $i | awk -F- '{ print $NF }')
                arch=$(echo $basearch | sed 's/i386/i686/')
-               for j in /etc/planetlab/bootcd-variants/*; do
+               for j in $(ls -d /etc/planetlab/bootcd-variants/* 2> /dev/null); do
                        name="${j##*/}"
                        url=$(cat "$j" | sed "s!@BASEARCH@!$basearch!g;s!@ARCH@!$arch!g")
                        if test -d "$name"; then