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 AE547139694 for ; Wed, 12 Apr 2017 08:44:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D19721C08D; Wed, 12 Apr 2017 08:44:16 +0000 (UTC) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0099B21C08D for ; Wed, 12 Apr 2017 08:44:15 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id o81so4921488wmb.0 for ; Wed, 12 Apr 2017 01:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hEG/I7TJfKkq9tq7Q8BbW36RM5htGWSaI1RO8tksp6E=; b=Aei4UI69pz6QgQ5sF1oe36vIwZSdAbpR3tSzHnzC8oklD5hbEosiAP/BSkCzdaBcbv Xm4MOqgoQabhsCYd8xRN77aTI39FktxyVn8Rc+yI/1xbMhjBivlObC8ZPeZdQ3PbGbVO 7HOXtPM2xSzeTNcmE0Mtw4C1721RKT4aZMFt+8vN4UZs/9gfZVI2MP6hzSkLYdQKKggg icXG2g13YzLPlvnFBpPwY9CgQqz+Cqw/SeyujbZqRkvuvLDnRCf7Ej7u4e+3tqzZRzqJ /qLNZvx1bhd1vRzFTje0hUyk4dVXQ2BBFCpHvr+hbXXy+3tKHii0OGekfa3kwLoz5m+B CsNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hEG/I7TJfKkq9tq7Q8BbW36RM5htGWSaI1RO8tksp6E=; b=pbLiihNFr1lGh6q0+mYFU8v3nyzhz/pbBtGU9D/I7hOA2uSnVfNtEXToCpMeTCQjNY EBT1qibvPhaj+KHtqy3ORJ1/uxo+L+PlRs19mf4yOm3T1T9jYq4vawy2bV9PunJuaJXD serqOVqGk0tXMrqAchzEvGZ1KIWyIZYGld5ojFxAN7vw5qts5LfCOJtQMwJd4xSZnkGV UYvdAXWRoD7HkluKw17m4/+QbiyfI/HcEGf/ZAv/PHRE4Tqa065X2PiBtuUpGS4El9QB VnBc8WnMpGwA07fqcqeyDBJ/zOwdhnoRCzbQlyWaM4oPDrIc3fIGhYgYLcEUli1TU8L4 vMeg== X-Gm-Message-State: AN3rC/5VakfomnCcY8MsrQKXrSCVBRa/Z9AOmnfwWhgOWt9vBEql9JGC Rl8pbIeE6UUEl+WkB88= X-Received: by 10.28.32.193 with SMTP id g184mr6016737wmg.56.1491986654646; Wed, 12 Apr 2017 01:44:14 -0700 (PDT) Received: from localhost.localdomain (ppp005055006220.access.hol.gr. [5.55.6.220]) by smtp.googlemail.com with ESMTPSA id g53sm453131wrg.22.2017.04.12.01.44.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Apr 2017 01:44:14 -0700 (PDT) From: Christos Kotsi To: gentoo-catalyst@lists.gentoo.org Cc: christo.kotsi@gmail.com Subject: [gentoo-catalyst] [PATCH 4/6] Added some loops Date: Wed, 12 Apr 2017 11:43:47 +0300 Message-Id: <20170412084349.2017-4-christo.kotsi@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170412084349.2017-1-christo.kotsi@gmail.com> References: <20170412084349.2017-1-christo.kotsi@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 1684ffa8-9aed-4359-be48-526b0ad77814 X-Archives-Hash: 788ce4fed34d49e8c97a5b6f9135f9c3 --- 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