summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-02-11 15:13:09 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-04-30 21:46:13 -0500
commit9b4871770ed2be5f3980a0a7b83c529254a69fd0 (patch)
tree8a607d0e165a5dca2882608ab6d3182c76cbaa41 /autoconfig
parentEnsure /lib/firmware exists before we try to extract into it. (diff)
downloadlivecd-tools-9b4871770ed2be5f3980a0a7b83c529254a69fd0.tar.gz
livecd-tools-9b4871770ed2be5f3980a0a7b83c529254a69fd0.tar.bz2
livecd-tools-9b4871770ed2be5f3980a0a7b83c529254a69fd0.zip
migrate most services to the list_services function
Diffstat (limited to 'autoconfig')
-rwxr-xr-xautoconfig22
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:]])