From 660eb871b36ddfcd12b11f9657b69caeac0bddbb Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 7 Jul 2011 00:30:03 +0200 Subject: [PATCH] Drop deprecated config_firewire_dev(). CONFIG_IEEE1394_RAWIO is gone since kernel 2.6.37 and the workaround should happen inside udev rules instead of boot-time if so. --- autoconfig | 1 - autoconfig.functions | 22 ---------------------- grml-autoconfig | 2 -- 3 files changed, 25 deletions(-) diff --git a/autoconfig b/autoconfig index 5e76359..be5baa8 100644 --- a/autoconfig +++ b/autoconfig @@ -67,7 +67,6 @@ CONFIG_DMRAID='yes' # support for dmraid CONFIG_EXTRACT='yes' # specify which (only in combination with bootparam myconfig/netconfig useful) CONFIG_FAST='yes' # skip startup of w3m on tty1 CONFIG_FINDDCSDIR='yes' # search for a debs, config, scripts directory -CONFIG_FIREWIRE_DEV='no' # bugfix for kernel >=2.6.11 - create some firewire-devices CONFIG_FIX_PASSWD='yes' # fix unionfs-problem with passwd CONFIG_FIX_UNIONFS='yes' # fix/workaround for unionfs CONFIG_FWTIMEOUT='yes' # set timeout for firmware loading diff --git a/autoconfig.functions b/autoconfig.functions index ab7062d..bf447f6 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -629,28 +629,6 @@ config_local_net(){ } # }}} -# firewire devices {{{ -# the raw1394 driver does not yet export info into SYSFS, -# so let's create raw1394 device manually -# http://www.michael-prokop.at/blog/index.php?p=352 -config_firewire_dev(){ -if checkbootparam 'nofirewiredev' ; then - ewarn "Skipping creating some firewire devices as requested on boot commandline." ; eend 0 -else -#if [ "${KERNEL%-*}" == "2.6.11" ] ; then - einfo "Creating some firewire devices (fix kernel 2.6-bug)." -# cd /dev && MAKEDEV video1394 raw1394 - [ -r /dev/raw1394 ] || mknod /dev/raw1394 c 171 0 - [ -r /dev/video1394 ] || mknod -m 666 /dev/video1394 c 171 16 -# mknod -m 666 /dev/dv1394 c 171 32 # for NTSC - [ -r /dev/dv1394 ] || mknod -m 666 /dev/dv1394 c 171 34 # for PAL - chown -R root:video /dev/raw1394 /dev/video1394 /dev/dv1394 - chmod -R 664 /dev/raw1394 /dev/video1394 /dev/dv1394 ; eend $? -fi -#fi -} -# }}} - # {{{ copy passwd-lockfile to ramdisk (fix unionfs-behaviour) # otherwise we will get: passwd: Authentication token lock busy config_fix_passwd(){ diff --git a/grml-autoconfig b/grml-autoconfig index f67457f..2f214c2 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -138,8 +138,6 @@ echo "0" > /proc/sys/kernel/printk checkvalue $CONFIG_LOCAL_NET && config_local_net -checkvalue $CONFIG_FIREWIRE_DEV && config_firewire_dev - checkvalue $CONFIG_TESTCD && config_testcd [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14 -- 2.1.4