[SCM] debian-live/config-webc branch, master, updated. f32bb2dad13c095d4df93a99fa1b9827c3572d0f

[Kai Hendry]

The following commit has been merged in the master branch:
commit f32bb2dad13c095d4df93a99fa1b9827c3572d0f
Author: Kai Hendry <hendry at iki.fi>
Date:   Tue Nov 22 10:40:09 2011 +0100

    Make FF extension work by default

diff --git a/webconverger/auto/config b/webconverger/auto/config
index cc9521b..fddf8d2 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -4,7 +4,7 @@
 #MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
 
 lb config noauto --clean \
-	--bootappend-live "homepage=http://webconverger.com?v=9.0 hostname=webconverger nonetworking nopersistent quickreboot nomodeset noroot splash username=webc vga=current quiet" \
+	--bootappend-live "homepage=http://webconverger.com hostname=webconverger nonetworking nopersistent quickreboot nomodeset splash username=webc vga=current quiet noroot" \
 	-k 486 \
 	-a i386 \
 	-b iso-hybrid \
diff --git a/webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js b/webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js
index 4c7a5d9..0469931 100644
--- a/webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js
+++ b/webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js
@@ -5,3 +5,6 @@ pref("intl.locale.matchOS", true);
 
 pref("browser.shell.checkDefaultBrowser", false);
 lockPref("xpinstall.enabled" ,false);
+
+lockPref("extensions.autoDisableScopes", 0);
+lockPref("extensions.shownSelectionUI", true);

-- 
debian-live/config-webc