Replace "." with "source".

[catalyst.git] / targets / support / bootloader-setup.sh

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index e86e0ae47e7d3f166ca82bd97eebacf3ff211152..2832b9ff8076bdacc4d2a7cf7b4d1b0cc036b8a7 100644 (file)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-. ${clst_sharedir}/targets/support/functions.sh
-. ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_sharedir}/targets/support/filesystem-functions.sh
 
 # $1 is the destination root
 
@@ -43,9 +43,16 @@ case ${clst_hostarch} in
                icfg=$1/boot/palo.conf
                kmsg=$1/boot/kernels.msg
                hmsg=$1/boot/help.msg
-               echo "--commandline=0/${first} initrd=${first}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts}" >> ${icfg}
+               # Make sure we strip the extension to the kernel to allow palo to choose
+               boot_kernel_common_name=${first/%32/}
+               boot_kernel_common_name=${boot_kernel_common_name/%64/}
+               echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
                echo "--bootloader=boot/iplboot" >> ${icfg}
                echo "--ramdisk=boot/${first}.igz" >> ${icfg}
+               for x in ${clst_boot_kernel}
+               do
+                       echo "--recoverykernel=boot/${x}" >> ${icfg}
+               done
        ;;
        ppc*|powerpc*)
                # NO SOFTLEVEL SUPPORT YET
@@ -228,6 +235,11 @@ case ${clst_hostarch} in
                        echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
                        echo >> ${iacfg}
                        echo "image=/efi/boot/${x}" >> ${iacfg}
+                       echo "  label=${x}-ilo">> ${iacfg}
+                       echo '  append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS3,9600"' >> ${iacfg}
+                       echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
+                       echo >> ${iacfg}
+                       echo "image=/efi/boot/${x}" >> ${iacfg}
                        echo "  label=${x}-sgi">> ${iacfg}
                        echo '  append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttySG0,115200"' >> ${iacfg}
                        echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
@@ -245,6 +257,7 @@ case ${clst_hostarch} in
                        kmsg=$1/isolinux/kernels.msg
                        echo "default ${first}" > ${icfg}
                        echo "timeout 150" >> ${icfg}
+                       echo "ontimeout localhost" >> ${icfg}
                        echo "prompt 1" >> ${icfg}
                        echo "display boot.msg" >> ${icfg}
                        echo "F1 kernels.msg" >> ${icfg}
@@ -258,7 +271,7 @@ case ${clst_hostarch} in
                        echo "Available kernels:" > ${kmsg}
                        for i in 2 3 4 5 6 7
                        do
-                               cp ${clst_sharedir}/files/livecd/x86-F$i.msg \
+                               cp ${clst_sharedir}/livecd/files/x86-F$i.msg \
                                        $1/isolinux/F$i.msg
                        done
 
@@ -307,6 +320,10 @@ case ${clst_hostarch} in
                                echo "label memtest86" >> $icfg
                                echo "  kernel memtest86" >> $icfg
                        fi
+                       echo >> $icfg
+                       echo "label localhost" >> $icfg
+                       echo "  localboot -1" >> $icfg
+                       echo "  MENU HIDE" >> $icfg
                fi
 
                if [ -e $1/boot/efi/elilo.efi ]
@@ -401,7 +418,7 @@ case ${clst_hostarch} in
                        # Setup help message
                        echo >> ${icfg}
                        echo "title help" >> ${icfg}
-                       cp ${clst_sharedir}/files/livecd/README.txt \
+                       cp ${clst_sharedir}/livecd/files/README.txt \
                                $1/boot/help.msg
                        echo "cat /boot/help.msg" >> ${icfg}