From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1CB601381F3 for ; Thu, 25 Apr 2013 06:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0BDCE09B7; Thu, 25 Apr 2013 06:22:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00DBAE09B7 for ; Thu, 25 Apr 2013 06:22:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14AAB33DDD8 for ; Thu, 25 Apr 2013 06:22:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7A621E4407 for ; Thu, 25 Apr 2013 06:22:31 +0000 (UTC) From: "Fabio Erculiani" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Erculiani" Message-ID: <1366874464.499f2d98b60588987b8e0a9e3a59a182c83d5785.lxnay@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: lxnay X-VCS-Committer-Name: Fabio Erculiani X-VCS-Revision: 499f2d98b60588987b8e0a9e3a59a182c83d5785 X-VCS-Branch: master Date: Thu, 25 Apr 2013 06:22:31 +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-Archives-Salt: d2732dff-d157-402f-bce3-082379b6c5a9 X-Archives-Hash: f73c8ba88f8f25e1046afe8da1923b52 commit: 499f2d98b60588987b8e0a9e3a59a182c83d5785 Author: Fabio Erculiani sabayon org> AuthorDate: Tue Apr 23 16:31:51 2013 +0000 Commit: Fabio Erculiani gentoo org> CommitDate: Thu Apr 25 07:21:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=499f2d98 Improve speed of bootstrapCD by not calling devicelist unless needed --- defaults/initrd.scripts | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index a216b84..ff724b5 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -157,12 +157,15 @@ devicelist(){ } bootstrapCD() { - local DEVICES=`devicelist` - # The device was specified on the command line, so there's no need to scan - # a bunch of extra devices + local DEVICES= + + # The device was specified on the command line, so there's no need + # to scan a bunch of extra devices [ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}" + [ -z "${CDROOT_DEV}" ] && DEVICES=$(devicelist) - findmediamount "cdrom" "${SUBDIR}/${CDROOT_MARKER}" "REAL_ROOT" "${CDROOT_PATH}" ${DEVICES} + findmediamount "cdrom" "${SUBDIR}/${CDROOT_MARKER}" \ + "REAL_ROOT" "${CDROOT_PATH}" ${DEVICES} } bootstrapKey() {