summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/bin/hwautocfg
diff options
context:
space:
mode:
authorNico Dietrich2006-01-26 22:59:47 +0100
committerNico Dietrich2006-01-26 22:59:47 +0100
commit3bd54055f8885dfe17639fca06c772ff6c4ec3a2 (patch)
treea8206d0430aa6f3f34a56da8b9b16d785a5a5981 /initrd/initrd-stuff/bin/hwautocfg
parenthal and haldaemon differences in SuSE 9.3 and 10. Do not give start and (diff)
downloadcore-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.tar.gz
core-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.tar.xz
core-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.zip
einige bugfixes
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@44 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
-rwxr-xr-xinitrd/initrd-stuff/bin/hwautocfg6
1 files changed, 3 insertions, 3 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 392ab93b..d722015e 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -174,8 +174,8 @@ for section in Files ServerFlags Module InputDevice Monitor \
echo -e ${ServerFlags} >>$xfc
;;
Device)
- echo -e ${Device} | sed -e "s,XMODULE,${XMODULE},g" \
- -e "s,XDESC,${XDESC}," >>$xfc
+ echo -e ${Device} | \
+ sed -e "s,XMODULE,${XMODULE}," -e "s%XDESC%${XDESC}%" >>$xfc
# special options may be needed for some drivers
[ $DEBUGLEVEL -gt 1 ] && msg "X setup" \
"adding for some Xfree86 modules \
@@ -303,7 +303,7 @@ waitfor /tmp/hwrun1 50000 || \
Please check that\n hwsetup is properly installed and executable."
# "drivers" (pseudo, placeholder strings, ...) to exclude from loading
-DRIVERLIST="disabled unknown ignore pcspkr synaptics"
+DRIVERLIST="disabled unknown ignore pcspkr synaptics keybdev"
# driver blacklist (real modules which fail to load)
DRIVERLIST=${DRIVERLIST}" hw_random"
# check for USB, pcmcia and ieee1394 hardware drivers