diff options
author | 2014-05-22 12:29:08 -0400 | |
---|---|---|
committer | 2014-05-22 12:29:08 -0400 | |
commit | c692089f622e4f89d62987215e8a32cccf54aa8a (patch) | |
tree | 8aee00097372300fb41d73afda726de9e0e8e1d5 | |
parent | net-setup: make dialog calls more readable (diff) | |
download | livecd-tools-c692089f622e4f89d62987215e8a32cccf54aa8a.tar.gz livecd-tools-c692089f622e4f89d62987215e8a32cccf54aa8a.tar.bz2 livecd-tools-c692089f622e4f89d62987215e8a32cccf54aa8a.zip |
remove firmware init script2.0.4
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.
-rwxr-xr-x | init.d/autoconfig | 2 | ||||
-rwxr-xr-x | init.d/firmware | 25 | ||||
-rwxr-xr-x | init.d/hwsetup | 4 |
3 files changed, 1 insertions, 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 |