From f2e153489077f9159aefaf146e876d7f93683648 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 16 Mar 2011 11:01:16 +0100 Subject: [PATCH] attempt to fix small glitches in boot.log --- bootcd.spec | 2 ++ kvariant.sh | 2 +- plc.d/bootcd-kernel | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootcd.spec b/bootcd.spec index 43e9c92..dc5734d 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..d8fde68 100755 --- a/kvariant.sh +++ b/kvariant.sh @@ -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 diff --git a/plc.d/bootcd-kernel b/plc.d/bootcd-kernel index c7d51b8..e7526fa 100755 --- a/plc.d/bootcd-kernel +++ b/plc.d/bootcd-kernel @@ -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 -- 2.43.0