[oe-commits] Andreas Oberritter : initscripts-opendreambox: consolidate initscripts
GIT User account
git at amethyst.openembedded.net
Sat Oct 25 10:45:12 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 418cab5db0cf56a0e461dea09ebcec630305a98a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=418cab5db0cf56a0e461dea09ebcec630305a98a
Author: Andreas Oberritter <obi at opendreambox.org>
Date: Thu Oct 23 13:28:31 2008 +0200
initscripts-opendreambox: consolidate initscripts
- don't load lcd.ko (already loaded by rcS)
- don't mount proc (already mounted by rcS)
- don't hide errors by redirecting stderr
- use /dev/discs/disc0/disc for the primary hdd
- dm7020: fix boot logo
- dm7025: fix progress bar hopping
- dm800: don't load isofs and ide-cd, because CDPLAYER_SUPPORT_R
is disabled in dreambox-image.bb
- dm800: explicitly load bcm7401.ko, drop info.ko
- dm8000: try to disable dma only for /dev/ide/host0/bus0/target0/lun0/cd
---
packages/initscripts/initscripts-1.0/dm7020/bootup | 36 ++++++--------------
packages/initscripts/initscripts-1.0/dm7025/bootup | 26 +++++---------
packages/initscripts/initscripts-1.0/dm800/bootup | 26 ++++++--------
packages/initscripts/initscripts-1.0/dm8000/bootup | 34 ++++++++----------
.../initscripts/initscripts-opendreambox_1.0.bb | 7 ++--
5 files changed, 50 insertions(+), 79 deletions(-)
diff --git a/packages/initscripts/initscripts-1.0/dm7020/bootup b/packages/initscripts/initscripts-1.0/dm7020/bootup
index 551441a..ecbefea 100644
--- a/packages/initscripts/initscripts-1.0/dm7020/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7020/bootup
@@ -1,9 +1,5 @@
-modprobe lcd
echo 4 > /proc/progress
-mount -t proc proc /proc
-echo 8 > /proc/progress
-
mount -t sysfs sysfs /sys
echo 12 > /proc/progress
@@ -11,40 +7,30 @@ depmod -Ae
echo 16 > /proc/progress
swapon -a
-echo 20 > /proc/progress
+echo 18 > /proc/progress
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+mount -at nonfs,nosmbfs,noncpfs
echo 24 > /proc/progress
tar xzf /etc/var.tar.gz -C /
echo 28 > /proc/progress
# sleep after 10min
-hdparm -S120 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -S 120 /dev/discs/disc0/disc
echo 32 > /proc/progress
# set UDMA66
-hdparm -X66 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -X66 /dev/discs/disc0/disc
echo 34 > /proc/progress
# accustic management
-hdparm -M128 /dev/ide/host0/bus0/target0/lun0/disc
-
-echo 38 > /proc/progress
-modprobe head
-
-echo 42 > /proc/progress
-modprobe dreambox_keyboard
+hdparm -M 128 /dev/discs/disc0/disc
-echo 46 > /proc/progress
-modprobe fp
-
-echo 50 > /proc/progress
-modprobe rfmod
+echo 44 > /proc/progress
+for mod in head dreambox_keyboard fp rfmod; do
+ modprobe $mod
+done
echo 54 > /proc/progress
-[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe
-
-echo 58 > /proc/progress
-/boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
+[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
echo 62 > /proc/progress
hostname -F /etc/hostname
@@ -56,7 +42,7 @@ echo 70 > /proc/progress
ifup -a
echo 78 > /proc/progress
-mount -at nfs,smbfs,cpfs 2>/dev/null
+mount -at nfs,smbfs,cpfs
echo 82 > /proc/progress
[ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
diff --git a/packages/initscripts/initscripts-1.0/dm7025/bootup b/packages/initscripts/initscripts-1.0/dm7025/bootup
index 19fd0ba..1c6c526 100644
--- a/packages/initscripts/initscripts-1.0/dm7025/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7025/bootup
@@ -1,10 +1,6 @@
-modprobe lcd
echo 4 > /proc/progress
[ -e /dev/dbox/oled0 ] && ln -s /dev/dbox/oled0 /dev/dbox/lcd0
-mount -t proc proc /proc
-echo 8 > /proc/progress
-
mount -t sysfs sysfs /sys
echo 12 > /proc/progress
@@ -15,31 +11,28 @@ swapon -a
echo 18 > /proc/progress
for mod in cifs nfsd usb-storage sd autofs4 vfat; do
- modprobe $mod 2> /dev/null ;
+ modprobe $mod
done
echo 22 > /proc/progress
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
-echo 44 > /proc/progress
+mount -at nonfs,nosmbfs,noncpfs
+echo 24 > /proc/progress
tar xzf /etc/var.tar.gz -C /
echo 28 > /proc/progress
# sleep after 10min
-hdparm -S120 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -S 120 /dev/discs/disc0/disc
echo 32 > /proc/progress
# set UDMA66
-hdparm -X66 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -X66 /dev/discs/disc0/disc
echo 34 > /proc/progress
# accustic management
-hdparm -M128 /dev/ide/host0/bus0/target0/lun0/disc
-
-echo 38 > /proc/progress
-modprobe xilleon
+hdparm -M 128 /dev/discs/disc0/disc
echo 44 > /proc/progress
-for mod in dreambox_keyboard fp rt73 zd1211b rfmod info; do
- modprobe $mod 2> /dev/null ;
+for mod in xilleon dreambox_keyboard fp rt73 zd1211b rfmod; do
+ modprobe $mod
done
echo 50 > /proc/progress
@@ -58,8 +51,7 @@ echo 70 > /proc/progress
ifup -a
echo 78 > /proc/progress
-# network mounts should be done here.
-mount -at nfs,smbfs,cpfs 2>/dev/null
+mount -at nfs,smbfs,cpfs
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 b3f03fd..70e41f4 100644
--- a/packages/initscripts/initscripts-1.0/dm800/bootup
+++ b/packages/initscripts/initscripts-1.0/dm800/bootup
@@ -1,10 +1,6 @@
-modprobe lcd
echo 10 > /proc/progress
[ -e /dev/dbox/oled0 ] && ln -s /dev/dbox/oled0 /dev/dbox/lcd0
-mount -t proc proc /proc
-echo 11 > /proc/progress
-
mount -t sysfs sysfs /sys
echo 12 > /proc/progress
@@ -14,31 +10,31 @@ echo 13 > /proc/progress
swapon -a
echo 14 > /proc/progress
-for mod in isofs cifs nfsd usb-storage sd autofs4 vfat ide-cd; do
- modprobe $mod 2> /dev/null ;
+for mod in cifs nfsd usb-storage sd autofs4 vfat; do
+ modprobe $mod
done
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+mount -at nonfs,nosmbfs,noncpfs
echo 15 > /proc/progress
tar xzf /etc/var.tar.gz -C /
echo 16 > /proc/progress
# sleep after 10min
-hdparm -S 120 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
+hdparm -S 120 /dev/discs/disc0/disc
echo 17 > /proc/progress
# set UDMA66, enable dma
-hdparm -d 1 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
-hdparm -X66 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
+hdparm -d 1 /dev/discs/disc0/disc
+hdparm -X66 /dev/discs/disc0/disc
# accustic management
-hdparm -M 128 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
+hdparm -M 128 /dev/discs/disc0/disc
echo 18 > /proc/progress
-for i in dreambox_keyboard fp info; do
- modprobe $i;
+for mod in dreambox_keyboard fp bcm7401; do
+ modprobe $mod
done
echo 19 > /proc/progress
@@ -48,7 +44,7 @@ cat /etc/videomode > /proc/stb/video/videomode
echo 20 > /proc/progress
for mod in rt73 zd1211b; do
- modprobe $mod 2> /dev/null ;
+ modprobe $mod
done
echo 21 > /proc/progress
@@ -66,7 +62,7 @@ echo 23 > /proc/progress
ifup -a
echo 24 > /proc/progress
-mount -at nfs,smbfs,cpfs 2>/dev/null
+mount -at nfs,smbfs,cpfs
[ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
diff --git a/packages/initscripts/initscripts-1.0/dm8000/bootup b/packages/initscripts/initscripts-1.0/dm8000/bootup
index cf8d6a0..26c188f 100644
--- a/packages/initscripts/initscripts-1.0/dm8000/bootup
+++ b/packages/initscripts/initscripts-1.0/dm8000/bootup
@@ -11,38 +11,34 @@ swapon -a
echo 14 > /proc/progress
for mod in isofs cifs nfsd usb-storage sd autofs4 vfat ide-cd cdfs; do
- modprobe $mod 2> /dev/null ;
+ modprobe $mod
done
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+mount -at nonfs,nosmbfs,noncpfs
echo 15 > /proc/progress
tar xzf /etc/var.tar.gz -C /
echo 16 > /proc/progress
# sleep after 10min
-for i in 0 1; do
- hdparm -S 120 /dev/ide/host0/bus$i/target0/lun0/disc || /bin/true;
-done
+hdparm -S 120 /dev/discs/disc0/disc
echo 17 > /proc/progress
# set UDMA66, enable dma
-hdparm -d 1 /dev/discs/disc0/disc || /bin/true;
-hdparm -X66 /dev/discs/disc0/disc || /bin/true;
+hdparm -d 1 /dev/discs/disc0/disc
+hdparm -X66 /dev/discs/disc0/disc
# accustic management
-hdparm -M 128 /dev/discs/disc0/disc || /bin/true;
+hdparm -M 128 /dev/discs/disc0/disc
-# disable dma for cd drive ...
+# disable dma for cd drive ...
# we remove this when the dma timeout problem is fixed!
-for i in 0 1; do
- hdparm -d 0 /dev/ide/host0/bus$i/target0/lun0/cd || /bin/true;
-done
+hdparm -d 0 /dev/ide/host0/bus0/target0/lun0/cd
echo 18 > /proc/progress
-for i in dreambox_keyboard fp bcm7400; do
- modprobe $i;
+for mod in dreambox_keyboard fp bcm7400; do
+ modprobe $mod
done
echo 19 > /proc/progress
@@ -52,16 +48,16 @@ cat /etc/videomode > /proc/stb/video/videomode
echo 20 > /proc/progress
for mod in rt73 zd1211b; do
- modprobe $mod 2> /dev/null ;
+ modprobe $mod
done
echo "loading madwifi modules"
for x in wlan ath_rate; do
- for mod in `ls /lib/modules/$(uname -r)/net | grep $x | cut -d . -f 0`; do
- modprobe $mod 2> /dev/null ;
+ for mod in `ls /lib/modules/$(uname -r)/net | grep $x | cut -d . -f 0`; do
+ modprobe $mod
done
done
-modprobe ath_pci 2> /dev/null
+modprobe ath_pci
echo 21 > /proc/progress
@@ -78,7 +74,7 @@ echo 23 > /proc/progress
ifup -a
echo 24 > /proc/progress
-mount -at nfs,smbfs,cpfs 2>/dev/null
+mount -at nfs,smbfs,cpfs
[ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
diff --git a/packages/initscripts/initscripts-opendreambox_1.0.bb b/packages/initscripts/initscripts-opendreambox_1.0.bb
index 8ffe387..51b60c3 100644
--- a/packages/initscripts/initscripts-opendreambox_1.0.bb
+++ b/packages/initscripts/initscripts-opendreambox_1.0.bb
@@ -6,9 +6,10 @@ DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
PR = "r11"
-PR_dm7025 = "r12"
-PR_dm8000 = "r14"
-PR_dm800 = "r12"
+PR_dm7020 = "r12"
+PR_dm7025 = "r13"
+PR_dm8000 = "r15"
+PR_dm800 = "r13"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
More information about the Openembedded-commits
mailing list