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 1PnzVE-0005bT-Jx for garchives@archives.gentoo.org; Fri, 11 Feb 2011 20:22:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E141E0B16; Fri, 11 Feb 2011 20:21:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 424F1E0B16 for ; Fri, 11 Feb 2011 20:21:57 +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 7569C1B4028 for ; Fri, 11 Feb 2011 20:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A51AF8006A for ; Fri, 11 Feb 2011 20:21:55 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" 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: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: b0efbf5d14e6f5d89a0988f15c15c737afdd4d6d Date: Fri, 11 Feb 2011 20:21:55 +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: b21a8d69a20ddfcdfad23a9eaf695853 commit: b0efbf5d14e6f5d89a0988f15c15c737afdd4d6d Author: William Hubbs gentoo org> AuthorDate: Fri Feb 11 20:16:54 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Feb 11 20:16:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.= git;a=3Dcommit;h=3Db0efbf5d more openrc related fixes - make sure hardware services are not running before we start them. - convert some tests to use yesno instead of comparisons to "yes" or "no". --- autoconfig | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/autoconfig b/autoconfig index f7d3284..e8f7123 100755 --- a/autoconfig +++ b/autoconfig @@ -474,7 +474,10 @@ start() { then modprobe apm power_off=3D1 >/dev/null 2>&1 && \ einfo "APM BIOS found, power management functions enabled ..." - rc-service -i apmd start + if ! service_started apmd + then + rc-service -i apmd start + fi else einfo "Not Loading APM Bios support ..." fi @@ -491,20 +494,23 @@ start() { modprobe thermal >/dev/null 2>&1 modprobe video >/dev/null 2>&1 modprobe dock >/dev/null 2>&1 - rc-service -i acpid start + if ! service_started acpid + then + rc-service -i acpid start + fi eend else einfo "Not Loading ACPI support ..." fi =20 - if yesno "${IDEDMA}" + if yesno "${IDEDMA}" && ! service_started hdparm then rc-service -i hdparm start else ewarn "Disabling IDE DMA support ..." fi =20 - if yesno "${PCMCIA}" + if yesno "${PCMCIA}" && ! service_started pcmcia then rc-service -i pcmcia start else @@ -535,9 +541,12 @@ start() { # Migrated to autoconfig-gpm-pre fi =20 - [ "${DETECT}" =3D "no" ] && DHCP=3D"no" - [ "${DETECT}" =3D "yes" ] \ - && NETDEVICES=3D"$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc= /net/dev 2>/dev/null)" + if yesno "${DETECT}" + then + NETDEVICES=3D"$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/ne= t/dev 2>/dev/null)" + else + DHCP=3D"no" + fi =20 if [ -n "${NETDEVICES}" ] then @@ -557,16 +566,15 @@ start() { fi fi done - if yesno "${NFS}" + if yesno "${NFS}" && ! service_started nfsmount then - rc-service -i portmap start rc-service -i nfsmount start fi if ! yesno "${PASSWD}" then echo "root:${PASSWORD}" | chpasswd > /dev/null 2>&1 - else - rc-service pwgen start + elif ! service_started pwgen + rc-service -i pwgen start fi if yesno "${SSHD}" then @@ -596,7 +604,10 @@ start() { =20 einfo "${sndmsg}" =20 - rc-service -i alsasound start + if ! service_started alsasound + then + rc-service -i alsasound start + fi =20 if [ -e /proc/asound/cards ] then