[oe-commits] pieterg : initscripts-opendreambox: swapon after mounting local devices ( to support swap file on local device)

[GIT User account]

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

Author: pieterg <pieterg at gmx.com>
Date:   Fri Nov 14 20:47:27 2008 +0100

initscripts-opendreambox: swapon after mounting local devices (to support swap file on local device)

---

 .../initscripts/initscripts-1.0/dm500plus/bootup   |    2 +-
 .../initscripts/initscripts-1.0/dm600pvr/bootup    |    2 +-
 packages/initscripts/initscripts-1.0/dm7020/bootup |    4 ++--
 packages/initscripts/initscripts-1.0/dm7025/bootup |    8 ++++----
 packages/initscripts/initscripts-1.0/dm800/bootup  |    6 +++---
 packages/initscripts/initscripts-1.0/dm8000/bootup |    6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/initscripts/initscripts-1.0/dm500plus/bootup b/packages/initscripts/initscripts-1.0/dm500plus/bootup
index 82b739f..6a89ffd 100644
--- a/packages/initscripts/initscripts-1.0/dm500plus/bootup
+++ b/packages/initscripts/initscripts-1.0/dm500plus/bootup
@@ -2,8 +2,8 @@ modprobe lcd
 mount -t proc proc /proc
 mount -t sysfs sysfs /sys
 depmod -Ae
-swapon -a
 mount -at nonfs,nosmbfs,noncpfs,nocifs 2>/dev/null
+swapon -a
 tar xzf /etc/var.tar.gz -C /
 modprobe head
 modprobe dreambox_keyboard
diff --git a/packages/initscripts/initscripts-1.0/dm600pvr/bootup b/packages/initscripts/initscripts-1.0/dm600pvr/bootup
index 2710740..ca7651e 100644
--- a/packages/initscripts/initscripts-1.0/dm600pvr/bootup
+++ b/packages/initscripts/initscripts-1.0/dm600pvr/bootup
@@ -2,8 +2,8 @@ modprobe lcd
 mount -t proc proc /proc
 mount -t sysfs sysfs /sys
 depmod -Ae
-swapon -a
 mount -at nonfs,nosmbfs,noncpfs,nocifs 2>/dev/null
+swapon -a
 tar xzf /etc/var.tar.gz -C /
 # sleep after 10min
 hdparm -S120 /dev/ide/host0/bus0/target0/lun0/disc
diff --git a/packages/initscripts/initscripts-1.0/dm7020/bootup b/packages/initscripts/initscripts-1.0/dm7020/bootup
index 666702e..61f807f 100644
--- a/packages/initscripts/initscripts-1.0/dm7020/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7020/bootup
@@ -6,10 +6,10 @@ echo 12 > /proc/progress
 depmod -Ae
 echo 16 > /proc/progress
 
-swapon -a
+mount -at nonfs,nosmbfs,noncpfs,nocifs
 echo 18 > /proc/progress
 
-mount -at nonfs,nosmbfs,noncpfs,nocifs
+swapon -a
 echo 24 > /proc/progress
 
 tar xzf /etc/var.tar.gz -C /
diff --git a/packages/initscripts/initscripts-1.0/dm7025/bootup b/packages/initscripts/initscripts-1.0/dm7025/bootup
index e993b7b..ae07393 100644
--- a/packages/initscripts/initscripts-1.0/dm7025/bootup
+++ b/packages/initscripts/initscripts-1.0/dm7025/bootup
@@ -7,15 +7,15 @@ echo 12 > /proc/progress
 depmod -Ae
 echo 16 > /proc/progress
 
-swapon -a
-echo 18 > /proc/progress
-
 for mod in cifs nfsd usb-storage sd autofs4 vfat; do
 	modprobe $mod
 done
-echo 22 > /proc/progress
+echo 18 > /proc/progress
 
 mount -at nonfs,nosmbfs,noncpfs,nocifs
+echo 22 > /proc/progress
+
+swapon -a
 echo 24 > /proc/progress
 
 tar xzf /etc/var.tar.gz -C /
diff --git a/packages/initscripts/initscripts-1.0/dm800/bootup b/packages/initscripts/initscripts-1.0/dm800/bootup
index 4912e63..4cf73e1 100644
--- a/packages/initscripts/initscripts-1.0/dm800/bootup
+++ b/packages/initscripts/initscripts-1.0/dm800/bootup
@@ -7,14 +7,14 @@ echo 12 > /proc/progress
 depmod -Ae
 echo 13 > /proc/progress
 
-swapon -a
-echo 14 > /proc/progress
-
 for mod in cifs nfsd usb-storage sd autofs4 vfat; do
 	modprobe $mod
 done
 
 mount -at nonfs,nosmbfs,noncpfs,nocifs
+echo 14 > /proc/progress
+
+swapon -a
 echo 15 > /proc/progress
 
 tar xzf /etc/var.tar.gz -C /
diff --git a/packages/initscripts/initscripts-1.0/dm8000/bootup b/packages/initscripts/initscripts-1.0/dm8000/bootup
index f53eda9..4c25181 100644
--- a/packages/initscripts/initscripts-1.0/dm8000/bootup
+++ b/packages/initscripts/initscripts-1.0/dm8000/bootup
@@ -7,14 +7,14 @@ echo 12 > /proc/progress
 depmod -Ae
 echo 13 > /proc/progress
 
-swapon -a
-echo 14 > /proc/progress
-
 for mod in isofs cifs nfsd usb-storage sd autofs4 vfat ide-cd cdfs; do
 	modprobe $mod
 done
 
 mount -at nonfs,nosmbfs,noncpfs,nocifs
+echo 14 > /proc/progress
+
+swapon -a
 echo 15 > /proc/progress
 
 tar xzf /etc/var.tar.gz -C /