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 1PngOh-0006Sj-7X for garchives@archives.gentoo.org; Thu, 10 Feb 2011 23:58:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE088E09DA; Thu, 10 Feb 2011 23:57:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 82EA5E09DA for ; Thu, 10 Feb 2011 23:57:55 +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 E66771B40B8 for ; Thu, 10 Feb 2011 23:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 534558006A for ; Thu, 10 Feb 2011 23:57:54 +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: <8d8fbc97a3d1485f0aa7e407e0d59eacd42ceef1.williamH@gentoo> 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: 8d8fbc97a3d1485f0aa7e407e0d59eacd42ceef1 Date: Thu, 10 Feb 2011 23:57:54 +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: e2f684b37820613f91889fd071173acc commit: 8d8fbc97a3d1485f0aa7e407e0d59eacd42ceef1 Author: William Hubbs gentoo org> AuthorDate: Thu Feb 10 23:57:38 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Feb 10 23:57:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.= git;a=3Dcommit;h=3D8d8fbc97 migrate yes/no tests to use if yesno --- autoconfig | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/autoconfig b/autoconfig index 0f5ea58..c05a3d1 100755 --- a/autoconfig +++ b/autoconfig @@ -226,7 +226,7 @@ check_svc() { list_services() { get_config # Must not print anything here - if [ "${DETECT}" =3D "yes" ] + if yesno "${DETECT}" then local arch=3D"$(uname -m)" =20 @@ -402,14 +402,12 @@ start() { echo "0" > /proc/sys/kernel/printk get_config =20 - # DONE: BRLTTY migrated to depend - - if [ "${SPEAKUP}" =3D "yes" ] + if yesno "${SPEAKUP}" then modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} fi =20 - if [ "${DETECT}" =3D "yes" ] + if yesno "${DETECT}" then ebegin "Hardware detection started" local numcpu=3D"$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)" @@ -455,7 +453,7 @@ start() { fi =20 # Now, we check if we are supposed to run a coldplug script. - if [ "${COLDPLUG}" =3D "yes" ] + if yesno "${COLDPLUG}" then # Check whether we should be using hotplug/coldplug or whether we shou= ld # just let udev do it all. @@ -475,7 +473,7 @@ start() { ewarn "Hotplug/Coldplug disabled via cmdline ..." fi =20 - if [ "${APM}" =3D "yes" ] + if yesno "${APM}" then modprobe apm power_off=3D1 >/dev/null 2>&1 && \ einfo "APM BIOS found, power management functions enabled ..." @@ -484,7 +482,7 @@ start() { einfo "Not Loading APM Bios support ..." fi =20 - if [ "${ACPI}" =3D "yes" ] + if yesno "${ACPI}" then modprobe processor >/dev/null 2>&1 && \ ebegin "ACPI power management functions enabled" && \ @@ -502,21 +500,21 @@ start() { einfo "Not Loading ACPI support ..." fi =20 - if [ "${IDEDMA}" =3D "yes" ] + if yesno "${IDEDMA}" then [ -x /etc/init.d/hdparm ] && /etc/init.d/hdparm start else ewarn "Disabling IDE DMA support ..." fi =20 - if [ "${PCMCIA}" =3D "yes" ] + if yesno "${PCMCIA}" then [ -x /etc/init.d/pcmcia ] && /etc/init.d/pcmcia start else ewarn "PCMCIA disabled via cmdline ..." fi =20 - if [ "${DHCP}" =3D "no" ] + if ! yesno "${DHCP}" then sed -i -e '/^ifconfig_eth.*dhcp.*/ s/^/#/' \ -e '/^iface_eth.*dhcp.*/ s/^/#/' \ @@ -548,7 +546,7 @@ start() { then for nics in ${NETDEVICES} do - if [ "${DHCP}" =3D "yes" ] + if yesno "${DHCP}" then einfo "Network device ${HILITE}${nics}${NORMAL} detected, DHCP broad= casting for IP ..." if [ -f /var/run/dhcpcd-${nics}.pid ] @@ -562,22 +560,22 @@ start() { fi fi done - if [ "${NFS}" =3D "yes" ] + if yesno "${NFS}" then [ -x /etc/init.d/portmap ] && /etc/init.d/portmap start [ -x /etc/init.d/nfsmount ] && /etc/init.d/nfsmount start fi - if [ "${PASSWD}" =3D "no" ] + if ! yesno "${PASSWD}" then echo "root:${PASSWORD}" | chpasswd > /dev/null 2>&1 else /etc/init.d/pwgen start fi - if [ "${SSHD}" =3D "yes" ] + if yesno "${SSHD}" then # If we have passwd=3D on the command line, we do not run pwgen and w= e # set the root password to PASSWORD. - if [ "${PASSWD}" =3D "yes" ] + if yesno "${PASSWD}" then ewarn "WARNING: You are starting sshd with a scrambled root password= !!!" ewarn "WARNING: You need to set a root password to be able to login = remotely." @@ -588,7 +586,7 @@ start() { ewarn "No Network device auto detected ..." fi =20 - if [ "${ALSA}" =3D "yes" ] + if yesno "${ALSA}" then if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ] then @@ -655,7 +653,8 @@ start() { =20 [ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}" =20 - if [ "${X11}" =3D "no" ] + if ! yesno "${X11}" + then touch /etc/.noxdm fi =20