1 |
commit: c692089f622e4f89d62987215e8a32cccf54aa8a |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 22 16:29:08 2014 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 22 16:29:08 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=c692089f |
7 |
|
8 |
remove firmware init script |
9 |
|
10 |
The tarballing and subsequent unpacking of the firmware has been a |
11 |
source of issues which are being eliminated. Bugs 511040, 498986, plus |
12 |
probably some more. |
13 |
|
14 |
--- |
15 |
init.d/autoconfig | 2 +- |
16 |
init.d/firmware | 25 ------------------------- |
17 |
init.d/hwsetup | 4 ---- |
18 |
3 files changed, 1 insertion(+), 30 deletions(-) |
19 |
|
20 |
diff --git a/init.d/autoconfig b/init.d/autoconfig |
21 |
index 10a60b7..59eb64c 100755 |
22 |
--- a/init.d/autoconfig |
23 |
+++ b/init.d/autoconfig |
24 |
@@ -234,7 +234,7 @@ list_services() { |
25 |
svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)" |
26 |
if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug |
27 |
then |
28 |
- echo firmware hwsetup |
29 |
+ echo hwsetup |
30 |
fi |
31 |
svcs="${svcs} $(check_svc ${GPM} gpm-pre)" |
32 |
svcs="${svcs} $(check_svc ${GPM} gpm)" |
33 |
|
34 |
diff --git a/init.d/firmware b/init.d/firmware |
35 |
deleted file mode 100755 |
36 |
index c5534b9..0000000 |
37 |
--- a/init.d/firmware |
38 |
+++ /dev/null |
39 |
@@ -1,25 +0,0 @@ |
40 |
-#!/sbin/runscript |
41 |
-# Copyright 1999-2011 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
-# $Header: $ |
44 |
- |
45 |
-# This unpacks any firmware tarballs. |
46 |
- |
47 |
-depend() { |
48 |
- : |
49 |
-} |
50 |
- |
51 |
-start() { |
52 |
- ebegin "Checking for firmware to unpack" |
53 |
- if [ -e /lib/firmware.tar.bz2 ] |
54 |
- then |
55 |
- eindent |
56 |
- ebegin "Unpacking firmware" |
57 |
- mkdir -p /lib/firmware |
58 |
- tar xjf /lib/firmware.tar.bz2 -C /lib/firmware |
59 |
- eend 0 |
60 |
- eoutdent |
61 |
- fi |
62 |
- [ -x /sbin/udevadm ] && /sbin/udevadm trigger |
63 |
- eend $? |
64 |
-} |
65 |
|
66 |
diff --git a/init.d/hwsetup b/init.d/hwsetup |
67 |
index a13e3be..35cfdae 100755 |
68 |
--- a/init.d/hwsetup |
69 |
+++ b/init.d/hwsetup |
70 |
@@ -3,10 +3,6 @@ |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
# $Header: $ |
73 |
|
74 |
-depend() { |
75 |
- need firmware |
76 |
-} |
77 |
- |
78 |
start() { |
79 |
ebegin "Starting hwsetup" |
80 |
[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig |