From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Tue, 24 Apr 2012 02:59:58 +0000 (+0200)
Subject: pandora-first-run-wizard and pandora-state: Moved zram module loading into /etc/modules
X-Git-Tag: sz_beta4~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=33f570be6dba8c6fa8b966a25a24e130fb521463

pandora-first-run-wizard and pandora-state: Moved zram module loading into /etc/modules
---

diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
index d0c2cc3..a4f1a13 100755
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -234,8 +234,9 @@ if ! grep -q 'blacklist wl1251_sdio' /etc/modprobe.conf 2> /dev/null; then
   echo 'blacklist wl1251_sdio' >> /etc/modprobe.conf
 fi
 
-# add Midi Module
+# add Midi Module and zram
 echo snd-seq>>/etc/modules
+echo zram>>/etc/modules
 
 # get rid of some dirs in /media that OE creates but are unlikely to be used
 rmdir /media/card /media/cf /media/mmc1 /media/net /media/realroot /media/union 2> /dev/null
diff --git a/recipes/pandora-system/pandora-state/rc.pandora-state b/recipes/pandora-system/pandora-state/rc.pandora-state
index 637f0b1..e5729fc 100644
--- a/recipes/pandora-system/pandora-state/rc.pandora-state
+++ b/recipes/pandora-system/pandora-state/rc.pandora-state
@@ -71,7 +71,6 @@ d_start() {
 	sed -n '11p' /etc/pandora/conf/nubs.state > /proc/pandora/nub1/scroll_rate
 	sed -n '12p' /etc/pandora/conf/nubs.state > /proc/pandora/nub1/mbutton_threshold
 	echo "Enabling ZRAM Swap"
-	modprobe zram
 	mkswap /dev/zram0
 	swapon -p 5 /dev/zram0
 }