commit:     c692089f622e4f89d62987215e8a32cccf54aa8a
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 16:29:08 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu May 22 16:29:08 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=c692089f

remove firmware init script

The tarballing and subsequent unpacking of the firmware has been a
source of issues which are being eliminated. Bugs 511040, 498986, plus
probably some more.

---
 init.d/autoconfig |  2 +-
 init.d/firmware   | 25 -------------------------
 init.d/hwsetup    |  4 ----
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 10a60b7..59eb64c 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -234,7 +234,7 @@ list_services() {
        svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
        if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e 
hotplug
        then
-               echo firmware hwsetup
+               echo hwsetup
        fi
        svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
        svcs="${svcs} $(check_svc ${GPM} gpm)"

diff --git a/init.d/firmware b/init.d/firmware
deleted file mode 100755
index c5534b9..0000000
--- a/init.d/firmware
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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() {
-       ebegin "Checking for firmware to unpack"
-       if [ -e /lib/firmware.tar.bz2 ]
-       then
-               eindent
-               ebegin "Unpacking firmware"
-               mkdir -p /lib/firmware
-               tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
-               eend 0
-               eoutdent
-       fi
-       [ -x /sbin/udevadm ] && /sbin/udevadm trigger
-       eend $?
-}

diff --git a/init.d/hwsetup b/init.d/hwsetup
index a13e3be..35cfdae 100755
--- a/init.d/hwsetup
+++ b/init.d/hwsetup
@@ -3,10 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-depend() {
-       need firmware
-}
-
 start() {
        ebegin "Starting hwsetup"
        [ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig

Reply via email to