| 1 |
it requires beyound ancient libkudzu and mostly obsoleted by udev. |
| 2 |
also libkudzu no longer builds on stable glibc-2.32 |
| 3 |
|
| 4 |
https://bugs.gentoo.org/713946 |
| 5 |
Bug: https://bugs.gentoo.org/408535 |
| 6 |
Signed-off-by: Georgy Yakovlev <gyakovlev@g.o> |
| 7 |
--- |
| 8 |
init.d/autoconfig | 24 ++---------------------- |
| 9 |
init.d/hwsetup | 11 ----------- |
| 10 |
2 files changed, 2 insertions(+), 33 deletions(-) |
| 11 |
delete mode 100644 init.d/hwsetup |
| 12 |
|
| 13 |
diff --git a/init.d/autoconfig b/init.d/autoconfig |
| 14 |
index f541a0c..1dbfc5a 100644 |
| 15 |
--- a/init.d/autoconfig |
| 16 |
+++ b/init.d/autoconfig |
| 17 |
@@ -228,10 +228,6 @@ list_services() { |
| 18 |
svcs="${svcs} $(check_svc ${APM} apmd)" |
| 19 |
svcs="${svcs} $(check_svc ${BRLTTY} brltty)" |
| 20 |
svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)" |
| 21 |
- if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug |
| 22 |
- then |
| 23 |
- echo hwsetup |
| 24 |
- fi |
| 25 |
svcs="${svcs} $(check_svc ${GPM} gpm)" |
| 26 |
svcs="${svcs} $(check_svc ${IDEDMA} hdparm)" |
| 27 |
svcs="${svcs} $(check_svc ${NFS} nfsclient)" |
| 28 |
@@ -518,9 +514,6 @@ start() { |
| 29 |
ewarn "Skipping DHCP broadcast ..." |
| 30 |
fi |
| 31 |
|
| 32 |
- # Read in what hwsetup has found |
| 33 |
- [ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo |
| 34 |
- |
| 35 |
if yesno "${DETECT}" |
| 36 |
then |
| 37 |
NETDEVICES="$(detect_netdevices)" |
| 38 |
@@ -559,24 +552,11 @@ start() { |
| 39 |
ewarn "No Network device auto detected ..." |
| 40 |
fi |
| 41 |
|
| 42 |
- if yesno "${ALSA}" |
| 43 |
+ if ! yesno "${ALSA}" |
| 44 |
then |
| 45 |
- if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ] |
| 46 |
- then |
| 47 |
- einfo "Soundcard: " |
| 48 |
- |
| 49 |
- [ -n "${SOUND_FULLNAME}" ] \ |
| 50 |
- && einfo " ${WARN}${SOUND_FULLNAME} " |
| 51 |
- [ -n "${SOUND_DRIVER}" ] \ |
| 52 |
- && einfo " driver = ${SOUND_DRIVER}" |
| 53 |
- fi |
| 54 |
- else |
| 55 |
- ewarn "Skipping ALSA detection as requested on command line ..." |
| 56 |
+ ewarn "Skipping ALSA services as requested on command line ..." |
| 57 |
fi |
| 58 |
|
| 59 |
- [ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}" |
| 60 |
- |
| 61 |
- killall hwsetup 2>/dev/null |
| 62 |
echo "6" > /proc/sys/kernel/printk |
| 63 |
|
| 64 |
if ! yesno "${X11}" |
| 65 |
diff --git a/init.d/hwsetup b/init.d/hwsetup |
| 66 |
deleted file mode 100644 |
| 67 |
index 16ee967..0000000 |
| 68 |
--- a/init.d/hwsetup |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,11 +0,0 @@ |
| 71 |
-#!/sbin/openrc-run |
| 72 |
-# Copyright 1999-2011 Gentoo Foundation |
| 73 |
-# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: $ |
| 75 |
- |
| 76 |
-start() { |
| 77 |
- ebegin "Starting hwsetup" |
| 78 |
- [ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig |
| 79 |
- [ -x /usr/sbin/hwsetup ] && hwsetup |
| 80 |
- eend $? |
| 81 |
-} |
| 82 |
-- |
| 83 |
2.29.2 |
Archives