From 8e92f24c76eea97992ad7ba5e98e61dbc85cf0d5 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 28 Mar 2012 01:34:40 +0300 Subject: [PATCH] pandora-first-run-wizard: blacklist wifi modules wifi modules are to be loaded by wifi scripts, otherwise networkmanager brings the wifi up no matter what and there doesn't seem to be any sane way to stop it. --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index a63dc0c..e3da76b 100755 --- a/recipes/pandora-system/pandora-first-run-wizard.bb +++ b/recipes/pandora-system/pandora-first-run-wizard.bb @@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat COMPATIBLE_MACHINE = "omap3-pandora" -PR = "r29" +PR = "r30" SRC_URI = " \ file://first-run-wizard.sh \ 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 f30b80e..3fa6fc3 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 @@ -229,6 +229,11 @@ update-rc.d -f blueprobe remove update-rc.d -f dropbear remove update-rc.d -f wl1251-init remove +# prevent wifi from being autoloaded on later kernels, let wl1251-init script do it +if ! grep -q 'blacklist wl1251_sdio' /etc/modprobe.conf 2> /dev/null; then + echo 'blacklist wl1251_sdio' >> /etc/modprobe.conf +fi + # 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 -- 2.39.2