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 45E69138350 for ; Sat, 2 May 2020 01:41:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C64DBE09DD; Sat, 2 May 2020 01:40:57 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 BF17EE09DD for ; Sat, 2 May 2020 01:40:57 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id u22so4266040plq.12 for ; Fri, 01 May 2020 18:40:57 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=QdcDgG4Np65X8XoVwZYIL+aFdCdRu3Stq0SlxIU7SEY=; b=W9Oe1KG1GLw7DzLCxnMY8k4nrT+g6PV7kNCTXOcFxLlvVmE+S2pdN99zEDIkvNKX/I JW7MxTDtxI0ieWyPFesUJ5hS2zmmeAW91LwFRMcb4zkqZ4eXNx6gtAq84ZE+BwTKTt/J QDD7jiqwfz0gkOq7DUUV2XYDkEcmY1WHm5tCRlFa64q6KXErw7dITVs6XRqY8m8T+MQy KpMC9Yga2Hj5mr+gJSfbhLTuP1APvNea8PTggZFr0T0OwH+PzuwaFNl8S84NBKey4iBq EfEh0chZWDSV4zikGXme84FqhIFLApAuHcLuDDtvIqMZzv4sGhQyK3DDfdAnIuLvRupV wgkQ== X-Gm-Message-State: AGi0PuZeaJJXY3bj3EmiD+XeDMTlGlOqw3nhBylwiZwUUzL/wpm7SABA XLWdIQObrt+1Q+LsrP0El3zJ2WeE X-Google-Smtp-Source: APiQypKJk0i7MUoQkI7EFwK612GNJQ9o66pvyfNiZsb/lidB7B4zhXKxVMAQ93yNg2z+cCBbu5X5Lg== X-Received: by 2002:a17:902:c286:: with SMTP id i6mr3067336pld.135.1588383656438; Fri, 01 May 2020 18:40:56 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id a19sm3344704pfd.91.2020.05.01.18.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 18:40:55 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller Date: Fri, 1 May 2020 18:40:34 -0700 Message-Id: <20200502014036.1039317-6-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502014036.1039317-1-mattst88@gentoo.org> References: <20200502014036.1039317-1-mattst88@gentoo.org> 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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 7ad4fb89-0d72-4844-98c9-1579a98d6d74 X-Archives-Hash: 07924d1267d8e07520a11010b75c5e3e Signed-off-by: Matt Turner --- targets/support/bootloader-setup.sh | 21 +++++++++++++++++++-- targets/support/functions.sh | 22 ---------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index d507fe5e..d3a6b2dc 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -19,8 +19,25 @@ else fi extract_kernels $1/boot -check_bootargs -check_filesystem_type + +# Add any additional options +if [ -n "${clst_livecd_bootargs}" ] +then + for x in ${clst_livecd_bootargs} + do + cmdline_opts="${cmdline_opts} ${x}" + done +fi + +case ${clst_fstype} in + squashfs) + cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" + ;; + jffs2) + cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" + ;; +esac + 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" diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 601f5dc9..ac6710ad 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -216,25 +216,3 @@ extract_kernel() { mv ${1}/initramfs-* ${1}/${2}.igz fi } - -check_bootargs(){ - # Add any additional options - if [ -n "${clst_livecd_bootargs}" ] - then - for x in ${clst_livecd_bootargs} - do - cmdline_opts="${cmdline_opts} ${x}" - done - fi -} - -check_filesystem_type(){ - case ${clst_fstype} in - squashfs) - cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" - ;; - jffs2) - cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" - ;; - esac -} -- 2.26.2