diff options
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | internet-kiosk-management/share/ik_start | 4 | ||||
| -rw-r--r-- | internet-kiosk-management/share/profile/internet-kiosk.default/.placeholder | 0 | ||||
| -rw-r--r-- | internet-kiosk-management/share/profile/profiles.ini | 9 | ||||
| -rw-r--r-- | internet-kiosk/etc/iceweasel/pref/internet-kiosk.js (renamed from internet-kiosk/etc/iceweasel/pref/prefs.js) | 6 | ||||
| -rwxr-xr-x | internet-kiosk/sbin/internet-kiosk-daemon | 4 |
6 files changed, 10 insertions, 14 deletions
diff --git a/debian/control b/debian/control index 9d4828d..5e8bcf3 100644 --- a/debian/control +++ b/debian/control @@ -48,6 +48,7 @@ Depends: ${perl:Depends}, psmisc, iceweasel | firefox, + matchbox-window-manager, xul-ext-fullscreen, xinit, locales, diff --git a/internet-kiosk-management/share/ik_start b/internet-kiosk-management/share/ik_start index 70b06b8..cad97cd 100755 --- a/internet-kiosk-management/share/ik_start +++ b/internet-kiosk-management/share/ik_start @@ -18,5 +18,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -/usr/bin/iceweasel & +START_URL="http://wiki.debian.org" + +/usr/bin/iceweasel "$START_URL" & diff --git a/internet-kiosk-management/share/profile/internet-kiosk.default/.placeholder b/internet-kiosk-management/share/profile/internet-kiosk.default/.placeholder deleted file mode 100644 index e69de29..0000000 --- a/internet-kiosk-management/share/profile/internet-kiosk.default/.placeholder +++ /dev/null diff --git a/internet-kiosk-management/share/profile/profiles.ini b/internet-kiosk-management/share/profile/profiles.ini deleted file mode 100644 index 0f5a3b0..0000000 --- a/internet-kiosk-management/share/profile/profiles.ini +++ /dev/null @@ -1,9 +0,0 @@ -[General] -StartWithProfile=1 - -[Profile0] -Name=internet-kiosk -IsRelative=1 -Path=internet-kiosk.default - - diff --git a/internet-kiosk/etc/iceweasel/pref/prefs.js b/internet-kiosk/etc/iceweasel/pref/internet-kiosk.js index f2e6537..13f6fa5 100644 --- a/internet-kiosk/etc/iceweasel/pref/prefs.js +++ b/internet-kiosk/etc/iceweasel/pref/internet-kiosk.js @@ -1,4 +1,4 @@ -# Mozilla User Preferences +# Mozilla Preferences /* Do not edit this file. * @@ -15,8 +15,6 @@ pref("extensions.installCache", "[{\"name\":\"app-system-share\",\"addons\":{\"f pref("extensions.ui.dictionary.hidden", true); pref("general.skins.selectedSkin", "fullscreen"); pref("intl.charsetmenu.browser.cache", "UTF-8"); -pref("browser.startup.page", 1); -user_pref("browser.startup.homepage","http://wiki.it-zukunft-schule.de"); // Limit the disk cache, and disable it by default, to avoid users // filling up their home directory with cache files. @@ -48,4 +46,4 @@ pref("browser.safebrowsing.enabled", false); // /etc/debian-edu/www/wpad.dat for the WAPD files. The location of // The WPAD file is handed out using DHCP and Iceweasel should look for // http://wpad/wpad.dat automatically. -lockPref("network.proxy.type", 4);
\ No newline at end of file +lockPref("network.proxy.type", 4); diff --git a/internet-kiosk/sbin/internet-kiosk-daemon b/internet-kiosk/sbin/internet-kiosk-daemon index a6a9c14..44b7c2e 100755 --- a/internet-kiosk/sbin/internet-kiosk-daemon +++ b/internet-kiosk/sbin/internet-kiosk-daemon @@ -65,6 +65,9 @@ sub check_browser # make sure the .halt file is not present when we start this script system("rm -f /home/internet-kiosk/.halt"); +# start with a clean .mozilla config dir +system("rm -Rf /home/internet-kiosk/.mozilla"); + # pre-load the thinclient initialization script system("su internet-kiosk -c \". /etc/internet-kiosk/ik_init\""); @@ -102,6 +105,7 @@ elsif ($pid == 0 ) if ( check_x() ==0 ) { system("/usr/bin/Xorg -br &"); + system("DISPAY=:0 matchbox-window-manager &"); } # test if pulseaudio is running, if not launch it... |