[gentoo-commits] proj/livecd-tools:bl2-only commit in: /

["William Hubbs" <williamh@gentoo.org>]

commit:     57d22825601003cf35d658a10c8d46787dbbe755
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:13:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 21:13:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=57d22825

migrate most services to the list_services function

---
 autoconfig |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/autoconfig b/autoconfig
index 4e45702..4fb083b 100755
--- a/autoconfig
+++ b/autoconfig
@@ -268,7 +268,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${NFS} nfsmount)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
 	svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
-	svcs="${svcs} $(check_svc ${SSH} sshd)"
+	svcs="${svcs} $(check_svc ${SSHD} sshd)"
 
 	### TODO: make this baselayout-2 compatible
 	### TODO: make these checks accurate using service dependencies
@@ -504,17 +504,13 @@ start() {
 		einfo "Not Loading ACPI support ..."
 	fi
 
-	if yesno "${IDEDMA}" && ! service_started hdparm
+	if ! yesno "${IDEDMA}"
 	then
-		rc-service -i hdparm start
-	else
 		ewarn "Disabling IDE DMA support ..."
 	fi
 
-	if yesno "${PCMCIA}" && ! service_started pcmcia
+	if ! yesno "${PCMCIA}"
 	then
-		rc-service -i pcmcia start
-	else
 		ewarn "PCMCIA disabled via cmdline ..."
 	fi
 
@@ -567,15 +563,9 @@ start() {
 				fi
 			fi
 		done
-		if yesno "${NFS}" && ! service_started nfsmount
-		then
-			rc-service -i nfsmount start
-		fi
 		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
-		elif ! service_started pwgen
-			rc-service -i pwgen start
 		fi
 		if yesno "${SSHD}"
 		then
@@ -586,7 +576,6 @@ start() {
 				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."
 			fi
-			rc-service -i sshd start
 		fi
 	else
 		ewarn "No Network device auto detected ..."
@@ -605,11 +594,6 @@ start() {
 
 			einfo "${sndmsg}"
 
-			if ! service_started alsasound
-			then
-				rc-service -i alsasound start
-			fi
-
 			if [ -e /proc/asound/cards ]
 			then
 				for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])