[oe-commits] acid-burn : remove automount as it is started now via /etc/init.d/autofs

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: b3e58b0c70d50a1dcde342b418a12bc6dc43c31d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b3e58b0c70d50a1dcde342b418a12bc6dc43c31d

Author: acid-burn <acidburn at opendreambox.org>
Date:   Tue Dec  2 19:17:16 2008 +0100

remove automount as it is started now via /etc/init.d/autofs
don't start network twice, this is part of #37

---

 packages/initscripts/initscripts-1.0/dm7025/bootup |    2 --
 packages/initscripts/initscripts-1.0/dm800/bootup  |    4 ----
 packages/initscripts/initscripts-1.0/dm8000/bootup |    4 ----
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/packages/initscripts/initscripts-1.0/dm7025/bootup b/packages/initscripts/initscripts-1.0/dm7025/bootup
old mode 100644
new mode 100755
index a203f45..5fd7ef1
--- a/packages/initscripts/initscripts-1.0/dm7025/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7025/bootup
@@ -36,7 +36,6 @@ for mod in xilleon dreambox_keyboard fp rt73 zd1211b rfmod; do
 done
 
 echo 50 > /proc/progress
-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
@@ -48,7 +47,6 @@ echo 66 > /proc/progress
 /usr/bin/wdog /usr/bin/dccamd -
 
 echo 70 > /proc/progress
-ifup -a
 
 echo 78 > /proc/progress
 
diff --git a/packages/initscripts/initscripts-1.0/dm800/bootup b/packages/initscripts/initscripts-1.0/dm800/bootup
old mode 100644
new mode 100755
index 2456010..cc550a0
--- a/packages/initscripts/initscripts-1.0/dm800/bootup
+++ b/packages/initscripts/initscripts-1.0/dm800/bootup
@@ -49,8 +49,6 @@ done
 
 echo 21 > /proc/progress
 
-automount --ghost --timeout=1 /autofs file /etc/auto.hotplug
-
 [ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
 
 hostname -F /etc/hostname
@@ -61,8 +59,6 @@ echo 22 > /proc/progress
 
 echo 23 > /proc/progress
 
-ifup -a
-
 [ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
 
 echo 24 > /proc/progress
diff --git a/packages/initscripts/initscripts-1.0/dm8000/bootup b/packages/initscripts/initscripts-1.0/dm8000/bootup
old mode 100644
new mode 100755
index 0189f5c..a275ccb
--- a/packages/initscripts/initscripts-1.0/dm8000/bootup
+++ b/packages/initscripts/initscripts-1.0/dm8000/bootup
@@ -61,8 +61,6 @@ modprobe ath_pci
 
 echo 21 > /proc/progress
 
-automount --ghost --timeout=1 /autofs file /etc/auto.hotplug
-
 [ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
 
 hostname -F /etc/hostname
@@ -73,8 +71,6 @@ echo 22 > /proc/progress
 
 echo 23 > /proc/progress
 
-ifup -a
-
 [ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
 
 echo 24 > /proc/progress