From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PngWa-0007aY-Ec for garchives@archives.gentoo.org; Fri, 11 Feb 2011 00:06:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB115E0A61; Fri, 11 Feb 2011 00:06:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B09B3E0A61 for ; Fri, 11 Feb 2011 00:06:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 434541B43BA for ; Fri, 11 Feb 2011 00:06:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9EF738006A for ; Fri, 11 Feb 2011 00:06:04 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: Subject: [gentoo-commits] proj/livecd-tools:bl2-only commit in: / X-VCS-Repository: proj/livecd-tools X-VCS-Files: autoconfig X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: f22d5015e9d6a89c0e5d786a4ac58ce65e83c530 Date: Fri, 11 Feb 2011 00:06:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2be550f78803f73ac6510203495175d6 commit: f22d5015e9d6a89c0e5d786a4ac58ce65e83c530 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Feb 11 00:06:00 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Feb 11 00:06:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.= git;a=3Dcommit;h=3Df22d5015 Coldplug and hotplug are in list_services. --- autoconfig | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/autoconfig b/autoconfig index c05a3d1..a65968b 100755 --- a/autoconfig +++ b/autoconfig @@ -457,13 +457,10 @@ start() { then # Check whether we should be using hotplug/coldplug or whether we shou= ld # just let udev do it all. - if [ -x /etc/init.d/coldplug ] + # coldplug+hotplug would already be up due to list_services + if [ ! -x /etc/init.d/coldplug -a ! -x /etc/init.d/hotplug ] then - /etc/init.d/coldplug start - elif [ -x /etc/init.d/hotplug ] - then - /etc/init.d/hotplug start - else + # TODO: This needs to go to a seperate script, so that hwsetup can de= pend on it. unpack_firmware [ -x /sbin/udevtrigger ] && /sbin/udevtrigger fi