X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=build_step_create_install_cd.sh;h=be2248d26ad6502a92f26f38950c6a92fb28b712;hb=refs%2Fchanges%2F83%2F1983%2F2;hp=40d3880de1cb1f612ed48c691079afa5dcdf56c8;hpb=eb6df414a1b5d1b7b67d3dd5f9b7d0529b8cf5fc;p=ta%2Fbuild-tools.git

diff --git a/build_step_create_install_cd.sh b/build_step_create_install_cd.sh
index 40d3880..be2248d 100755
--- a/build_step_create_install_cd.sh
+++ b/build_step_create_install_cd.sh
@@ -50,7 +50,14 @@ wget_dir() {
   url=$(remove_extra_slashes_from_url $url)
   # count cut length in case url depth changes
   cut_dirs=$(echo $url | sed -re 's|.*://[^/]+/(.+)|\1|' -e 's|/$||' | grep -o / | wc -l)
-  wget -N -r --no-host-directories --no-verbose --cut-dirs=${cut_dirs} --reject index.html* --no-parent $url
+  wget -N -r \
+    --no-host-directories \
+    --no-verbose \
+    --cut-dirs=${cut_dirs} \
+    --reject index.html* \
+    --no-parent \
+    --execute robots=off \
+    $url
 }
 
 pushd $iso_build_dir
@@ -70,7 +77,7 @@ if [ "${iso_arch}" != 'aarch64' ]; then
         cp $scriptdir/isolinux/isolinux.cfg isolinux/isolinux.cfg
     else
         sed -i "s/^timeout.*/timeout 100/" isolinux/isolinux.cfg
-        sed -i "s/^ -  Press.*/Beginning the cloud installation process/" isolinux/boot.msg
+        sed -i "s/^ -  Press.*/Begin the cloud installation process/" isolinux/boot.msg
         sed -i "s/^#menu hidden/menu hidden/" isolinux/isolinux.cfg
         sed -i "s/menu default//" isolinux/isolinux.cfg
         sed -i "/^label linux/amenu default" isolinux/isolinux.cfg
@@ -79,6 +86,12 @@ if [ "${iso_arch}" != 'aarch64' ]; then
     cp -f $scriptdir/akraino_splash.png isolinux/splash.png
 fi
 
+# Update grub.cfg for EFI booting, similar to isolinux
+sed -i '/menuentry/{N;N;N;q}' EFI/BOOT/grub.cfg
+sed -i -e 's|Install CentOS 7|Begin the cloud installation process|' \
+       -e '/vmlinuz/ s/$/ console=tty0 console=ttyS1,115200 console=ttyAMA0,115200/' \
+    EFI/BOOT/grub.cfg
+
 popd
 
 pushd $tmp
@@ -106,6 +119,9 @@ if [ "${iso_arch}" != 'aarch64' ]; then
     cp -fp boot/vmlinuz-${KVER} $iso_build_dir/isolinux/vmlinuz
     cp -fp boot/initrd-provisioning.img $iso_build_dir/isolinux/initrd.img
 fi
+rm -f $iso_build_dir/images/pxeboot/vmlinuz $iso_build_dir/images/pxeboot/initrd.img
+cp -fp boot/vmlinuz-${KVER} $iso_build_dir/images/pxeboot/vmlinuz
+cp -fp boot/initrd-provisioning.img $iso_build_dir/images/pxeboot/initrd.img
 rm -rf boot/
 
 echo "Generating boot iso"