[SCM] debian-live/config-webc branch, yourlibrary.ca, updated. 13b10902b34563a9625bb1a20b1c9de608d15b93

[Kai Hendry]

The following commit has been merged in the yourlibrary.ca branch:
commit 13b10902b34563a9625bb1a20b1c9de608d15b93
Merge: ed0f2d1c3efcd5f5f3a7005922007ff5f4965b9b 2bffb08ab4d9fcacdc76e819bc6e9cb33818cd10
Author: Kai Hendry <hendry at iki.fi>
Date:   Fri Aug 1 18:10:32 2008 +0100

    Merge branch 'master' into yourlibrary.ca
    
    Conflicts:
    
    	webconverger/config/binary
    	webconverger/config/chroot_local-packageslists/iceweasel-l10n
    	webconverger/config/chroot_local-packageslists/myspell
    	webconverger/config/chroot_local-packageslists/webconverger

diff --combined webconverger/config/binary
index c32366c,9674f0e..d53a059
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@@ -14,8 -14,7 +14,7 @@@
  
  # $LH_BOOTAPPEND_LIVE: set boot parameters
  # (Default: empty)
- # nonetworking required else live-initramfs will overwrite the mtu include
- LH_BOOTAPPEND_LIVE="quiet homepage=http://www.yourlibrary.ca/ nonetworking nosudo kioskresetstation=10"
 -LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791"
++LH_BOOTAPPEND_LIVE="quiet homepage=http://www.yourlibrary.ca/ nonetworking nosudo kioskresetstation=10 splash vga=791"
  
  # $LH_BOOTAPPEND_INSTALL: set boot parameters
  # (Default: empty)
@@@ -36,11 -35,11 +35,11 @@@ LH_BOOTLOADER="grub
  
  # $LH_DEBIAN_INSTALLER: set debian-installer
  # (Default: disabled)
 -#LH_DEBIAN_INSTALLER="live"
 +# LH_DEBIAN_INSTALLER="live"
  
  # $LH_DEBIAN_INSTALLER_DAILY: set daily images
  # (Default: disabled)
- LH_DEBIAN_INSTALLER_DAILY="enabled"
+ #LH_DEBIAN_INSTALLER_DAILY="enabled"
  
  # $LH_ENCRYPTION: set encrytion
  # (Default: empty)
@@@ -72,7 -71,7 +71,7 @@@ LH_ISO_VOLUME="Webconverger $(date +%Y%
  
  # $LH_MEMTEST: set memtest
  # (Default: memtest86+)
- #LH_MEMTEST="memtest86+"
+ LH_MEMTEST="disabled"
  
  # $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
  # (Default: nfs)
@@@ -112,7 -111,7 +111,7 @@@
  
  # $LH_SYSLINUX_SPLASH: set custom syslinux splash
  # (Default: empty)
- #LH_SYSLINUX_SPLASH=""
+ LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
  
  # $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
  # (Default: 0)
@@@ -140,4 -139,4 +139,4 @@@ LH_SYSLINUX_TIMEOUT="10
  
  # $LH_USERNAME: set username
  # (Default: user)
- #LH_USERNAME="user"
+ LH_USERNAME="webc"
diff --combined webconverger/config/chroot_local-packageslists/webconverger
index 9458737,3396de6..09ab931
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@@ -1,6 -1,6 +1,6 @@@
  # Webconverger's main configuration hendry at webconverger.com
  # Minimal
- eject file sudo vim-tiny
+ eject file sudo
  
  # Standard
  console-common kbd locales
@@@ -11,27 -11,21 +11,22 @@@ xorg xresprobe discover men
  # Sound
  alsa-base alsa-oss alsa-utils
  
 -# For upgrade, firewall et al. features
 +# For upgrade
  live-initscripts
- rsync
  
  webconverger-base
  webconverger-archive-keyring
  
- # window manager
+ # Window manager
  dwm
+ 
  # For the background
  xloadimage
  
- # browser
- iceweasel
- 
  # For reseting the kiosk
  xautolock
  
- # Extension for iceweasel-yourlibrary
 +iceweasel-yourlibrary
- 
  # fonts
  ttf-dejavu
  ttf-gentium
@@@ -39,5 -33,8 +34,8 @@@
  # pdf
  xpdf mozplugger
  
+ # bootscreen
+ splashy
+ 
  ########## non-free software
  flashplugin-nonfree

-- 
debian-live/config-webc