Moved fusion module to misc and disabled it as default

diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index 7c4b2946e675ceba9fd683cf04f21ad73dd20a98..c0e0d9d4687152e48a247b58c8403fc0b344966e 100644 (file)
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -126,8 +126,8 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
-lib/modules/2.6.16.57-ipfire/drivers/char/fusion/fusion.ko
-lib/modules/2.6.16.57-ipfire-smp/drivers/char/fusion/fusion.ko
+lib/modules/2.6.16.57-ipfire/misc/drivers/char/fusion/fusion.ko
+lib/modules/2.6.16.57-ipfire-smp/misc/drivers/char/fusion/fusion.ko
 etc/udev/dvb.sh
 etc/udev/rules.d/10-dvb.rules
 srv/web/ipfire/cgi-bin/services.cgi

diff --git a/config/rootfiles/core/12/update.sh b/config/rootfiles/core/12/update.sh
index e6334cb15ba5a5593bdcb17d25eaa7c962052c28..3e4c5db7887485ca2fb39b0e52c5ddb0688b3aa8 100644 (file)
--- a/config/rootfiles/core/12/update.sh
+++ b/config/rootfiles/core/12/update.sh
@@ -4,4 +4,3 @@
 extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 depmod -a
-modprobe fusion

diff --git a/config/vdr/bin/runvdr-soft b/config/vdr/bin/runvdr-soft
index 8459df8dd18b0876b4f1de833f34309e8754db8a..dd51c0b9e110eacbc513d443b619b569f5bfbbf4 100755 (executable)
--- a/config/vdr/bin/runvdr-soft
+++ b/config/vdr/bin/runvdr-soft
@@ -1,3 +1,3 @@
 #!/bin/sh
 clear
-runvdr -Psoftdevice > /dev/null 2>&1
+runvdr -P\'softdevice -vo fb:\' > /dev/null 2>&1

diff --git a/lfs/linux-fusion b/lfs/linux-fusion
index bde3c05d9a38bfb00445003970c82da32f9ec7be..693412e3cfdfa1b84a733f42186d075e7a4fca58 100644 (file)
--- a/lfs/linux-fusion
+++ b/lfs/linux-fusion
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i "s@MODLIB)/drivers@MODLIB)/misc/drivers@g" Makefile
 ifeq "$(SMP)" "1"
        cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire-smp/g" Makefile
        cd $(DIR_APP) && make

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index 11ae443210009772696cd895f7a35b9dad2d62a9..5f8a77d8b19938c80ae445aa9e938709f3704cd3 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -31,6 +31,6 @@ parport_pc
 lp
 
 ### fusion
-fusion
+# fusion
 
 # End /etc/sysconfig/modules