From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 065B7138351 for ; Tue, 31 Mar 2020 18:39:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E86DFE098E; Tue, 31 Mar 2020 18:39:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE5E7E098E for ; Tue, 31 Mar 2020 18:39:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5F0234F383 for ; Tue, 31 Mar 2020 18:38:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 834691AA for ; Tue, 31 Mar 2020 18:38:57 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1585679897.6ea0ef2013c2137f7f1f6f1a5f675f42d2a16d64.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/bootloader-setup.sh targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6ea0ef2013c2137f7f1f6f1a5f675f42d2a16d64 X-VCS-Branch: master Date: Tue, 31 Mar 2020 18:38:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d6d81c6-f91d-4a4b-b4c5-3aa22921c3bd X-Archives-Hash: ae1da71ebc3618f4e508d05381db77e4 commit: 6ea0ef2013c2137f7f1f6f1a5f675f42d2a16d64 Author: Christos Kotsi gmail com> AuthorDate: Wed Apr 12 08:43:47 2017 +0000 Commit: Matt Turner gentoo 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 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