Update to support 32-bit EFI.

2 files changed, 19 insertions, 8 deletions

diff --git a/build_one.sh b/build_one.sh
index 63656e6..b819e31 100755
--- a/build_one.sh
+++ b/build_one.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
-./update_bootloader_files.sh
+arch=$(grep arch config/settings.cfg | sed s/arch=//)
+for arg in $*; do
+  value=${arg#arch=}
+  if [ $value != $arg ]; then
+    arch=$value
+  fi
+done
+./update_bootloader_files.sh $arch
 drakclassic='perl -I ../drakiso/lib ../drakiso/drakclassic'
 if [ $# -gt 0 ] ; then
   $drakclassic $*
diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh
index 9550c94..aaf381b 100755
--- a/update_bootloader_files.sh
+++ b/update_bootloader_files.sh
@@ -1,20 +1,24 @@
 #!/bin/sh
-repository=$(grep repository config/settings.cfg | sed s/repository=//)
+repository=$(grep ^repository config/settings.cfg | sed s/repository=//)
+if [ $# -eq 0 ]; then
+  arch=$(grep arch config/settings.cfg | sed s/arch=//)
+else
+  arch=$1
+fi
+echo "Fetching $arch bootloader files from $repository"
 
 # Remove old files
 rm -rf bootloader
 
-# The 64-bit packge contains everything we need. The non-UEFI grub2 images
-# are built for i386, and everything else should be architecture-independent
-path=`ls -1v $repository/x86_64/media/core/{release,updates}/drakiso-bootloader-files*.rpm 2> /dev/null | tail -1`
+path=`ls -1v $repository/$arch/media/core/{release,updates}/drakiso-bootloader-files*.rpm 2> /dev/null | tail -1`
 if [ -z $path ] ; then
-  echo "ERROR: couldn't find drakiso-bootloader-files RPM in $repository"
+  echo "ERROR: couldn't find $arch drakiso-bootloader-files RPM in $repository."
   exit 1
 else
-  echo "Extracting bootloader files from $repository"
+  echo "Extracting $arch bootloader files from repository."
   rpm2cpio $path | cpio -idm --quiet
   if [ $? -ne 0 ] ; then
-    echo "ERROR: failed to extract files from archive"
+    echo "ERROR: failed to extract files from archive."
     exit 1
   fi
   mv usr/share/drakiso-bootloader bootloader