[gentoo-catalyst] [PATCH 4/6] Added some loops

[Christos Kotsi]

---
 targets/support/bootloader-setup.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index d9e2620..97920e7 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -7,8 +7,7 @@ source ${clst_shdir}/support/filesystem-functions.sh
 
 extract_cdtar $1
 extract_kernels $1/boot
-check_bootargs
-check_filesystem_type
+check_{bootargs,filesystem_type}
 
 default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot"
 [ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"
@@ -274,15 +273,13 @@ case ${clst_hostarch} in
 			echo "prompt 1" >> ${icfg}
 			echo "display boot.msg" >> ${icfg}
 			echo "F1 kernels.msg" >> ${icfg}
-			echo "F2 F2.msg" >> ${icfg}
-			echo "F3 F3.msg" >> ${icfg}
-			echo "F4 F4.msg" >> ${icfg}
-			echo "F5 F5.msg" >> ${icfg}
-			echo "F6 F6.msg" >> ${icfg}
-			echo "F7 F7.msg" >> ${icfg}
+			for k in {2..7}
+			do
+				echo "F${k} F${k}.msg" >> ${icfg}
+			done
 
 			echo "Available kernels:" > ${kmsg}
-			for i in 2 3 4 5 6 7
+			for i in {2..7}
 			do
 				cp ${clst_sharedir}/livecd/files/x86-F$i.msg \
 					$1/isolinux/F$i.msg
@@ -303,7 +300,6 @@ case ${clst_hostarch} in
 						echo "label ${x}-${y}" >> ${icfg}
 						echo "  kernel ${x}" >> ${icfg}
 						echo "  append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
-
 						echo >> ${icfg}
 						echo "   ${x}" >> ${kmsg}
 						echo "label ${x}-${y}-nofb" >> ${icfg}
@@ -475,11 +471,9 @@ case ${clst_hostarch} in
 		# Next, figure out what kernels were specified in the
 		# spec file, and generate the appropriate arcload conf
 		# blocks specific to each system
-		ip22="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip22" | tr "\n" " ")"
-		ip27="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip27" | tr "\n" " ")"
-		ip28="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip28" | tr "\n" " ")"
-		ip30="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip30" | tr "\n" " ")"
-		ip32="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip32" | tr "\n" " ")"
+		for l in 22 27 28 30 32; do
+			ip${l}="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip${l}" | tr "\n" " ")"
+		done
 
 		if [ -n "${ip22}" ]; then
 			echo -e "${ip22base}" >> ${scratch}/arc.cf
-- 
2.10.2