| 1 |
commit: 9b4871770ed2be5f3980a0a7b83c529254a69fd0 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 11 21:13:09 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 02:46:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=9b487177 |
| 7 |
|
| 8 |
migrate most services to the list_services function |
| 9 |
|
| 10 |
--- |
| 11 |
autoconfig | 22 +++------------------- |
| 12 |
1 files changed, 3 insertions(+), 19 deletions(-) |
| 13 |
|
| 14 |
diff --git a/autoconfig b/autoconfig |
| 15 |
index 4e45702..4fb083b 100755 |
| 16 |
--- a/autoconfig |
| 17 |
+++ b/autoconfig |
| 18 |
@@ -268,7 +268,7 @@ list_services() { |
| 19 |
svcs="${svcs} $(check_svc ${NFS} nfsmount)" |
| 20 |
svcs="${svcs} $(check_svc ${PASSWD} pwgen)" |
| 21 |
svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)" |
| 22 |
- svcs="${svcs} $(check_svc ${SSH} sshd)" |
| 23 |
+ svcs="${svcs} $(check_svc ${SSHD} sshd)" |
| 24 |
|
| 25 |
### TODO: make this baselayout-2 compatible |
| 26 |
### TODO: make these checks accurate using service dependencies |
| 27 |
@@ -504,17 +504,13 @@ start() { |
| 28 |
einfo "Not Loading ACPI support ..." |
| 29 |
fi |
| 30 |
|
| 31 |
- if yesno "${IDEDMA}" && ! service_started hdparm |
| 32 |
+ if ! yesno "${IDEDMA}" |
| 33 |
then |
| 34 |
- rc-service -i hdparm start |
| 35 |
- else |
| 36 |
ewarn "Disabling IDE DMA support ..." |
| 37 |
fi |
| 38 |
|
| 39 |
- if yesno "${PCMCIA}" && ! service_started pcmcia |
| 40 |
+ if ! yesno "${PCMCIA}" |
| 41 |
then |
| 42 |
- rc-service -i pcmcia start |
| 43 |
- else |
| 44 |
ewarn "PCMCIA disabled via cmdline ..." |
| 45 |
fi |
| 46 |
|
| 47 |
@@ -567,15 +563,9 @@ start() { |
| 48 |
fi |
| 49 |
fi |
| 50 |
done |
| 51 |
- if yesno "${NFS}" && ! service_started nfsmount |
| 52 |
- then |
| 53 |
- rc-service -i nfsmount start |
| 54 |
- fi |
| 55 |
if ! yesno "${PASSWD}" |
| 56 |
then |
| 57 |
echo "root:${PASSWORD}" | chpasswd > /dev/null 2>&1 |
| 58 |
- elif ! service_started pwgen |
| 59 |
- rc-service -i pwgen start |
| 60 |
fi |
| 61 |
if yesno "${SSHD}" |
| 62 |
then |
| 63 |
@@ -586,7 +576,6 @@ start() { |
| 64 |
ewarn "WARNING: You are starting sshd with a scrambled root password!!!" |
| 65 |
ewarn "WARNING: You need to set a root password to be able to login remotely." |
| 66 |
fi |
| 67 |
- rc-service -i sshd start |
| 68 |
fi |
| 69 |
else |
| 70 |
ewarn "No Network device auto detected ..." |
| 71 |
@@ -605,11 +594,6 @@ start() { |
| 72 |
|
| 73 |
einfo "${sndmsg}" |
| 74 |
|
| 75 |
- if ! service_started alsasound |
| 76 |
- then |
| 77 |
- rc-service -i alsasound start |
| 78 |
- fi |
| 79 |
- |
| 80 |
if [ -e /proc/asound/cards ] |
| 81 |
then |
| 82 |
for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]]) |
Archives