* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-13 19:50 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-13 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 942c5e75558a1f9e575df2d7058038037ac72f95
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 19:49:15 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 19:49:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=942c5e75
make gpm-pre executable
---
0 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/init.d/gpm-pre b/init.d/gpm-pre
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-13 20:20 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-13 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 720ac10a645cf4e0d83ba2d5454e7eb4f2de4b23
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 20:20:17 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 20:20:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=720ac10a
add a message so we know autoconfig has started
---
init.d/autoconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index 9eec5ce..eb21020 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -410,6 +410,7 @@ detect_sparc() {
}
start() {
+ einfo "starting autoconfig"
echo "0" > /proc/sys/kernel/printk
get_config
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-14 3:15 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-14 3:15 UTC (permalink / raw
To: gentoo-commits
commit: cfba78fab6d66d47f87a7dc4bac262e5c3767ad1
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 03:15:18 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 03:15:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=cfba78fa
start gpm-pre before gpm from autoconfig
---
init.d/autoconfig | 1 +
init.d/gpm-pre | 5 -----
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index eb21020..55fbcfd 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -272,6 +272,7 @@ list_services() {
svcs="${svcs} $(check_svc ${APM} apmd)"
svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
+ svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
svcs="${svcs} $(check_svc ${GPM} gpm)"
svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
svcs="${svcs} $(check_svc ${NFS} nfsmount)"
diff --git a/init.d/gpm-pre b/init.d/gpm-pre
index af52b0e..f44e5c2 100755
--- a/init.d/gpm-pre
+++ b/init.d/gpm-pre
@@ -3,11 +3,6 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-# Do one of the following:
-# Add to /etc/rc.conf: rc_gpm_need="autoconfig-gpm-pre"
-# XOR
-# Add to /etc/conf.d/gpm: rc_need="autoconfig-gpm-pre"
-
depend() {
before gpm
need hwsetup
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-15 22:51 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-15 22:51 UTC (permalink / raw
To: gentoo-commits
commit: ff11dfc1a33486c964406773ff6c3ebecac6db0c
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:50:09 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 22:50:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=ff11dfc1
split out firmware extraction and hwsetup
Firmware extraction and hwsetup are now separate services.
---
init.d/autoconfig | 30 +++++-------------------------
init.d/firmware | 22 ++++++++++++++++++++++
init.d/hwsetup | 14 ++++++++++++++
3 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index 55fbcfd..e2655a6 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -272,6 +272,10 @@ list_services() {
svcs="${svcs} $(check_svc ${APM} apmd)"
svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
+ if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug
+ then
+ echo firmware hwsetup
+ fi
svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
svcs="${svcs} $(check_svc ${GPM} gpm)"
svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
@@ -287,17 +291,6 @@ list_services() {
echo ${svcs}
}
-unpack_firmware() {
- # This unpacks any firmware tarballs.
- if [ -e /lib/firmware.tar.bz2 ]
- then
- ebegin "Unpacking firmware"
- mkdir -p /lib/firmware
- tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
- eend 0
- fi
-}
-
get_info() {
local tmp
@@ -460,21 +453,8 @@ start() {
ewarn "Hardware detection disabled via cmdline ..."
fi
- # Now, we check if we are supposed to run a coldplug script.
- if yesno "${COLDPLUG}"
+ if ! yesno "${COLDPLUG}"
then
- # Check whether we should be using hotplug/coldplug or whether we should
- # just let udev do it all.
- # coldplug+hotplug would already be up due to list_services
- if ! rc-service -e coldplug && ! rc-service -e hotplug
- then
- # TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
- unpack_firmware
- [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
- fi
- [ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
- [ -x /usr/sbin/hwsetup ] && hwsetup
- else
ewarn "Hotplug/Coldplug disabled via cmdline ..."
fi
diff --git a/init.d/firmware b/init.d/firmware
new file mode 100755
index 0000000..d65d601
--- /dev/null
+++ b/init.d/firmware
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# This unpacks any firmware tarballs.
+
+depend() {
+ :
+}
+
+start() {
+einfo checking for firmware to unpack
+ if [ -e /lib/firmware.tar.bz2 ]
+ then
+ ebegin "Unpacking firmware"
+ mkdir -p /lib/firmware
+ tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
+ eend 0
+ fi
+ [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
+}
diff --git a/init.d/hwsetup b/init.d/hwsetup
new file mode 100755
index 0000000..aac4db5
--- /dev/null
+++ b/init.d/hwsetup
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+ need firmware
+}
+
+start() {
+ einfo starting hwsetup
+ [ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
+ [ -x /usr/sbin/hwsetup ] && hwsetup
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-16 18:48 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-16 18:48 UTC (permalink / raw
To: gentoo-commits
commit: 6f190108e98a8e270e121d36a7a709233726c6df
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 18:47:25 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 18:47:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=6f190108
fix udevtrigger call
The udevtrigger program has been replaced with udevadm.
---
init.d/firmware | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init.d/firmware b/init.d/firmware
index d65d601..35919c2 100755
--- a/init.d/firmware
+++ b/init.d/firmware
@@ -18,5 +18,5 @@ einfo checking for firmware to unpack
tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
eend 0
fi
- [ -x /sbin/udevtrigger ] && /sbin/udevtrigger
+ [ -x /sbin/udevadm ] && /sbin/udevadm trigger
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-16 19:57 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-16 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 3060aba3a9c88fa701ea5b3f0909d6257522c785
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 19:56:59 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 19:56:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=3060aba3
reset splash to verbose mode for speakup users
---
init.d/autoconfig | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index e2655a6..df1a8d1 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -587,6 +587,9 @@ start() {
killall hwsetup 2>/dev/null
echo "6" > /proc/sys/kernel/printk
+ splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
+ reset
+ chvt 1
}
# vim: ts=4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-02-16 21:46 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-02-16 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 25d06d1f7919d501415ba201747c1d533ca5f488
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 21:46:10 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 21:46:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=25d06d1f
add check to be sure splash is only reset for speakup users
---
init.d/autoconfig | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index df1a8d1..4854cb8 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -587,9 +587,13 @@ start() {
killall hwsetup 2>/dev/null
echo "6" > /proc/sys/kernel/printk
- splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
- reset
- chvt 1
+
+ if yesno "${SPEAKUP}"
+ then
+ splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
+ reset
+ chvt 1
+ fi
}
# vim: ts=4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/
@ 2011-03-08 18:20 William Hubbs
0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2011-03-08 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 5f7b10c49b6bcc998ab0989c028ebd55c228dbc8
Author: Fernando Orocu <fernando <AT> gentooligans <DOT> com>
AuthorDate: Tue Mar 8 18:17:49 2011 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 18:17:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=5f7b10c4
stop xdm if X11 is not requested
Xdm is being started very early in the boot sequence, before autoconfig,
so we need to stop it if the user doesn't want X11.
---
init.d/autoconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/init.d/autoconfig b/init.d/autoconfig
index 4854cb8..51657c8 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -588,8 +588,9 @@ start() {
killall hwsetup 2>/dev/null
echo "6" > /proc/sys/kernel/printk
- if yesno "${SPEAKUP}"
+ if ! yesno "${X11}"
then
+ rc-service xdm stop
splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
reset
chvt 1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-03-08 18:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-15 22:51 [gentoo-commits] proj/livecd-tools:bl2-only commit in: init.d/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2011-03-08 18:20 William Hubbs
2011-02-16 21:46 William Hubbs
2011-02-16 19:57 William Hubbs
2011-02-16 18:48 William Hubbs
2011-02-14 3:15 William Hubbs
2011-02-13 20:20 William Hubbs
2011-02-13 19:50 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox