| 1 |
commit: b0efbf5d14e6f5d89a0988f15c15c737afdd4d6d |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 11 20:16:54 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 11 20:16:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=b0efbf5d |
| 7 |
|
| 8 |
more openrc related fixes |
| 9 |
|
| 10 |
- make sure hardware services are not running before we start them. |
| 11 |
- convert some tests to use yesno instead of comparisons to "yes" or |
| 12 |
"no". |
| 13 |
|
| 14 |
--- |
| 15 |
autoconfig | 35 +++++++++++++++++++++++------------ |
| 16 |
1 files changed, 23 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/autoconfig b/autoconfig |
| 19 |
index f7d3284..e8f7123 100755 |
| 20 |
--- a/autoconfig |
| 21 |
+++ b/autoconfig |
| 22 |
@@ -474,7 +474,10 @@ start() { |
| 23 |
then |
| 24 |
modprobe apm power_off=1 >/dev/null 2>&1 && \ |
| 25 |
einfo "APM BIOS found, power management functions enabled ..." |
| 26 |
- rc-service -i apmd start |
| 27 |
+ if ! service_started apmd |
| 28 |
+ then |
| 29 |
+ rc-service -i apmd start |
| 30 |
+ fi |
| 31 |
else |
| 32 |
einfo "Not Loading APM Bios support ..." |
| 33 |
fi |
| 34 |
@@ -491,20 +494,23 @@ start() { |
| 35 |
modprobe thermal >/dev/null 2>&1 |
| 36 |
modprobe video >/dev/null 2>&1 |
| 37 |
modprobe dock >/dev/null 2>&1 |
| 38 |
- rc-service -i acpid start |
| 39 |
+ if ! service_started acpid |
| 40 |
+ then |
| 41 |
+ rc-service -i acpid start |
| 42 |
+ fi |
| 43 |
eend |
| 44 |
else |
| 45 |
einfo "Not Loading ACPI support ..." |
| 46 |
fi |
| 47 |
|
| 48 |
- if yesno "${IDEDMA}" |
| 49 |
+ if yesno "${IDEDMA}" && ! service_started hdparm |
| 50 |
then |
| 51 |
rc-service -i hdparm start |
| 52 |
else |
| 53 |
ewarn "Disabling IDE DMA support ..." |
| 54 |
fi |
| 55 |
|
| 56 |
- if yesno "${PCMCIA}" |
| 57 |
+ if yesno "${PCMCIA}" && ! service_started pcmcia |
| 58 |
then |
| 59 |
rc-service -i pcmcia start |
| 60 |
else |
| 61 |
@@ -535,9 +541,12 @@ start() { |
| 62 |
# Migrated to autoconfig-gpm-pre |
| 63 |
fi |
| 64 |
|
| 65 |
- [ "${DETECT}" = "no" ] && DHCP="no" |
| 66 |
- [ "${DETECT}" = "yes" ] \ |
| 67 |
- && NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)" |
| 68 |
+ if yesno "${DETECT}" |
| 69 |
+ then |
| 70 |
+ NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)" |
| 71 |
+ else |
| 72 |
+ DHCP="no" |
| 73 |
+ fi |
| 74 |
|
| 75 |
if [ -n "${NETDEVICES}" ] |
| 76 |
then |
| 77 |
@@ -557,16 +566,15 @@ start() { |
| 78 |
fi |
| 79 |
fi |
| 80 |
done |
| 81 |
- if yesno "${NFS}" |
| 82 |
+ if yesno "${NFS}" && ! service_started nfsmount |
| 83 |
then |
| 84 |
- rc-service -i portmap start |
| 85 |
rc-service -i nfsmount start |
| 86 |
fi |
| 87 |
if ! yesno "${PASSWD}" |
| 88 |
then |
| 89 |
echo "root:${PASSWORD}" | chpasswd > /dev/null 2>&1 |
| 90 |
- else |
| 91 |
- rc-service pwgen start |
| 92 |
+ elif ! service_started pwgen |
| 93 |
+ rc-service -i pwgen start |
| 94 |
fi |
| 95 |
if yesno "${SSHD}" |
| 96 |
then |
| 97 |
@@ -596,7 +604,10 @@ start() { |
| 98 |
|
| 99 |
einfo "${sndmsg}" |
| 100 |
|
| 101 |
- rc-service -i alsasound start |
| 102 |
+ if ! service_started alsasound |
| 103 |
+ then |
| 104 |
+ rc-service -i alsasound start |
| 105 |
+ fi |
| 106 |
|
| 107 |
if [ -e /proc/asound/cards ] |
| 108 |
then |
Archives