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 0637F1381F3 for ; Mon, 3 Jun 2013 23:35:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 882FDE09FE; Mon, 3 Jun 2013 23:35:09 +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 0939EE09F8 for ; Mon, 3 Jun 2013 23:35:03 +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 2042A33DEE1 for ; Mon, 3 Jun 2013 23:35:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 94182E5465 for ; Mon, 3 Jun 2013 23:35:00 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1366874440.682d0b0d0aaf30e4236809bcf87fc674e6e88c8c.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 682d0b0d0aaf30e4236809bcf87fc674e6e88c8c X-VCS-Branch: ryao Date: Mon, 3 Jun 2013 23:35:00 +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: 10df420a-a1b8-4c0c-a060-529934e3c9e6 X-Archives-Hash: 7e8a944f47b41db5f793176cebbe72fe commit: 682d0b0d0aaf30e4236809bcf87fc674e6e88c8c Author: Fabio Erculiani sabayon org> AuthorDate: Tue Apr 23 15:54:10 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Thu Apr 25 07:20:40 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=682d0b0d Drop "sleep 3" from sdelay if CDROOT=1. One can use scandelay=secs if needed. While this makes out of the box booting a bit harder on some ancient CD/DVD drives, it really speeds up the common use case by not sleeping for 3 seconds. --- defaults/initrd.scripts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index e614064..abd8fad 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -991,19 +991,13 @@ startLUKS() { sdelay() { # Sleep a specific number of seconds if SDELAY is set - if [ "${SDELAY}" ] + if [ -n "${SDELAY}" ] then good_msg "Waiting ${SDELAY} seconds..." sleep ${SDELAY} elif [ "${CDROOT}" = '1' ] then - # many CD/DVD drives require extra sleep, especially when - # connected via USB. Many people reported that 1 second sleep - # is not enough on their notebooks, that's why sleep 3, when booting - # off a livecd is a better default. - sleep 3 - else - good_msg 'Hint: Use parameter scandelay[=seconds] if you need waiting here' + good_msg 'Hint: Use scandelay[=seconds] if your live medium is slowand boot fails' fi }