initscripts-opendreambox: load zd1211b module

3 files changed, 16 insertions, 11 deletions

diff --git a/packages/initscripts/initscripts-1.0/dm7025/bootup b/packages/initscripts/initscripts-1.0/dm7025/bootup
index 27019db2c1..2a2b242197 100644
--- a/packages/initscripts/initscripts-1.0/dm7025/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7025/bootup
@@ -12,10 +12,15 @@ depmod -Ae
 echo 16 > /proc/progress
 
 swapon -a
-echo 20 > /proc/progress
+echo 18 > /proc/progress
 
-mount -a
-echo 24 > /proc/progress
+for mod in cifs nfsd usb-storage sd autofs4 vfat; do
+	modprobe $mod 2> /dev/null ;
+done
+echo 22 > /proc/progress
+
+mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+echo 44 > /proc/progress
 
 tar xzf /etc/var.tar.gz -C /
 echo 28 > /proc/progress
@@ -32,14 +37,13 @@ hdparm -M128 /dev/ide/host0/bus0/target0/lun0/disc
 echo 38 > /proc/progress
 modprobe xilleon
 
-echo 42 > /proc/progress
-modprobe dreambox_keyboard
-
-echo 46 > /proc/progress
-modprobe fp
+echo 44 > /proc/progress
+for mod in dreambox_keyboard fp rt73 zd1211b rfmod; do
+	modprobe $mod 2> /dev/null ;
+done
 
 echo 50 > /proc/progress
-modprobe rfmod
+automount --ghost --timeout=1 /autofs file /etc/auto.hotplug
 
 echo 54 > /proc/progress
 [ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
@@ -55,6 +59,7 @@ ifup -a
 
 echo 78 > /proc/progress
 # network mounts should be done here.
+mount -at nfs,smbfs,cpfs 2>/dev/null
 
 echo 82 > /proc/progress
 [ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
diff --git a/packages/initscripts/initscripts-1.0/dm800/bootup b/packages/initscripts/initscripts-1.0/dm800/bootup
index 4e36b9187c..194eb58490 100644
--- a/packages/initscripts/initscripts-1.0/dm800/bootup
+++ b/packages/initscripts/initscripts-1.0/dm800/bootup
@@ -41,7 +41,7 @@ cat /etc/videomode > /proc/stb/video/videomode
 
 echo 20 > /proc/progress
 
-for mod in dreambox_rc2 fp rt73; do
+for mod in dreambox_rc2 fp rt73 zd1211b; do
 	modprobe $mod 2> /dev/null ;
 done
 
diff --git a/packages/initscripts/initscripts-opendreambox_1.0.bb b/packages/initscripts/initscripts-opendreambox_1.0.bb
index 2c0414ee08..05452c1779 100644
--- a/packages/initscripts/initscripts-opendreambox_1.0.bb
+++ b/packages/initscripts/initscripts-opendreambox_1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"