[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6ea0ef2013c2137f7f1f6f1a5f675f42d2a16d64
Author:     Christos Kotsi <christo.kotsi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 12 08:43:47 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ea0ef20

targets: Simplify code with loops

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 12 +++++-------
 targets/support/livecdfs-update.sh  |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index 68e1355e..051adc28 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -191,15 +191,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

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index 0f39eab0..4156624c 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -68,10 +68,9 @@ fi
 
 # Setup links for ethernet devices
 cd /etc/init.d
-ln -sf net.lo net.eth1
-ln -sf net.lo net.eth2
-ln -sf net.lo net.eth3
-ln -sf net.lo net.eth4
+for i in {1..4}; do
+       ln -sf net.lo net.eth${i}
+done
 
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig