From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/livecd-tools:master commit in: /
Date: Sun, 1 May 2011 02:49:07 +0000 (UTC) [thread overview]
Message-ID: <7fb9d73581d11d43b64eff49b63ac2ff2d4d8e5f.williamH@gentoo> (raw)
commit: 7fb9d73581d11d43b64eff49b63ac2ff2d4d8e5f
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 20:16:54 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May 1 02:46:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=7fb9d735
more openrc related fixes
- make sure hardware services are not running before we start them.
- convert some tests to use yesno instead of comparisons to "yes" or
"no".
---
autoconfig | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/autoconfig b/autoconfig
index f7d3284..e8f7123 100755
--- a/autoconfig
+++ b/autoconfig
@@ -474,7 +474,10 @@ start() {
then
modprobe apm power_off=1 >/dev/null 2>&1 && \
einfo "APM BIOS found, power management functions enabled ..."
- rc-service -i apmd start
+ if ! service_started apmd
+ then
+ rc-service -i apmd start
+ fi
else
einfo "Not Loading APM Bios support ..."
fi
@@ -491,20 +494,23 @@ start() {
modprobe thermal >/dev/null 2>&1
modprobe video >/dev/null 2>&1
modprobe dock >/dev/null 2>&1
- rc-service -i acpid start
+ if ! service_started acpid
+ then
+ rc-service -i acpid start
+ fi
eend
else
einfo "Not Loading ACPI support ..."
fi
- if yesno "${IDEDMA}"
+ if yesno "${IDEDMA}" && ! service_started hdparm
then
rc-service -i hdparm start
else
ewarn "Disabling IDE DMA support ..."
fi
- if yesno "${PCMCIA}"
+ if yesno "${PCMCIA}" && ! service_started pcmcia
then
rc-service -i pcmcia start
else
@@ -535,9 +541,12 @@ start() {
# Migrated to autoconfig-gpm-pre
fi
- [ "${DETECT}" = "no" ] && DHCP="no"
- [ "${DETECT}" = "yes" ] \
- && NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+ if yesno "${DETECT}"
+ then
+ NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+ else
+ DHCP="no"
+ fi
if [ -n "${NETDEVICES}" ]
then
@@ -557,16 +566,15 @@ start() {
fi
fi
done
- if yesno "${NFS}"
+ if yesno "${NFS}" && ! service_started nfsmount
then
- rc-service -i portmap start
rc-service -i nfsmount start
fi
if ! yesno "${PASSWD}"
then
echo "root:${PASSWORD}" | chpasswd > /dev/null 2>&1
- else
- rc-service pwgen start
+ elif ! service_started pwgen
+ rc-service -i pwgen start
fi
if yesno "${SSHD}"
then
@@ -596,7 +604,10 @@ start() {
einfo "${sndmsg}"
- rc-service -i alsasound start
+ if ! service_started alsasound
+ then
+ rc-service -i alsasound start
+ fi
if [ -e /proc/asound/cards ]
then
next reply other threads:[~2011-05-01 2:50 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-01 2:49 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-26 17:07 [gentoo-commits] proj/livecd-tools:master commit in: / Rick Farina
2017-03-07 15:35 Brian Evans
2017-02-25 0:54 Robin H. Johnson
2017-01-10 21:54 Brian Evans
2015-10-18 2:26 William Hubbs
2015-10-18 1:45 Jorge Manuel B. S. Vicetto
2015-02-22 22:35 William Hubbs
2015-01-14 18:33 William Hubbs
2015-01-14 2:55 Jorge Manuel B. S. Vicetto
2013-07-07 22:48 William Hubbs
2013-07-07 22:28 William Hubbs
2013-07-06 23:53 William Hubbs
2013-02-25 18:20 William Hubbs
2013-02-25 17:48 William Hubbs
2013-02-25 17:48 William Hubbs
2011-06-30 20:31 William Hubbs
2011-06-28 19:56 William Hubbs
2011-06-28 17:32 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-05-01 2:49 William Hubbs
2011-02-17 5:38 William Hubbs
2011-02-10 21:30 William Hubbs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7fb9d73581d11d43b64eff49b63ac2ff2d4d8e5f.williamH@gentoo \
--to=williamh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox