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

[Kai Hendry]

The following commit has been merged in the master branch:
commit f87ea7b75838ba93b965449369103d65b0f04ecf
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu May 29 17:55:40 2008 +0100

    oops small error in Xorg hook

diff --git a/mini/config/binary b/mini/config/binary
index 5d64440..258bae8 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -10,7 +10,7 @@
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 kioskresetstation=3"
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
diff --git a/mini/config/chroot_local-hooks/xorg b/mini/config/chroot_local-hooks/xorg
index 2d63196..cb12fca 100755
--- a/mini/config/chroot_local-hooks/xorg
+++ b/mini/config/chroot_local-hooks/xorg
@@ -1,2 +1,3 @@
+echo Setting up Webconverger Xorg config
 rm /etc/X11/xorg.conf
-ln -s rm /etc/X11/xorg.webc.conf /etc/X11/xorg.conf
+ln -s /etc/X11/xorg.webc.conf /etc/X11/xorg.conf
diff --git a/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb b/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb
deleted file mode 100644
index 53f18c4..0000000
Binary files a/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb and /dev/null differ

-- 
debian-live/config-webc