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

[Kai Hendry]

The following commit has been merged in the master branch:
commit ab3ec01c2315a6f9adcd5996b925dfaa25213e58
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Aug 27 19:09:27 2008 +0100

    put installer in mini

diff --git a/mini/config/binary b/mini/config/binary
index e99ddf3..cf6d7ec 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -4,20 +4,24 @@
 # (Default: fat16)
 #LH_BINARY_FILESYSTEM="fat16"
 
+# $LH_BINARY_IMAGES: set image type
+# (Default: iso)
+#LH_BINARY_IMAGES="usb-hdd"
+
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
 #LH_BINARY_INDICES="enabled"
 
 # $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"
 
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
+# $LH_BOOTAPPEND_INSTALL: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_INSTALL="auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet"
 
 # $LH_BOOTLOADER: set bootloader
-# (Default: syslinux) for LH_BINARY_IMAGES="usb-hdd"
+# (Default: syslinux)
 LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
@@ -29,26 +33,15 @@ LH_BOOTLOADER="grub"
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
 #LH_CHROOT_BUILD="enabled"
 
-
-
-# Experimental Installer stuff
-#
 # $LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: disabled)
-# LH_DEBIAN_INSTALLER="live"
-
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-# LH_BOOTAPPEND_INSTALL="auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- ${LH_BOOTAPPEND_LIVE}"
+LH_DEBIAN_INSTALLER="live"
+LH_DEBIAN_INSTALLER_PRESEEDFILE="preseed.cfg"
 
 # $LH_DEBIAN_INSTALLER_DAILY: set daily images
 # (Default: disabled)
 #LH_DEBIAN_INSTALLER_DAILY="enabled"
 
-
-
-
-
 # $LH_ENCRYPTION: set encrytion
 # (Default: empty)
 #LH_ENCRYPTION=""
@@ -79,7 +72,6 @@ LH_ISO_VOLUME="Webconverger $(date +%Y%m%d-%H:%M)"
 
 # $LH_MEMTEST: set memtest
 # (Default: memtest86+)
-#LH_MEMTEST="memtest86+"
 LH_MEMTEST="disabled"
 
 # $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
diff --git a/mini/config/chroot_local-hooks/theme b/mini/config/chroot_local-hooks/theme
index bf222db..1cfe1a0 100755
--- a/mini/config/chroot_local-hooks/theme
+++ b/mini/config/chroot_local-hooks/theme
@@ -1,2 +1,5 @@
 rm /etc/splashy/themes/default/background.png
 ln -s /etc/webconverger/background.jpg /etc/splashy/themes/default/background.png
+
+# Theme is stored in initramfs; need to update it.
+update-initramfs -u -k all
diff --git a/mini/config/chroot_local-packages b/mini/config/chroot_local-packages
new file mode 120000
index 0000000..48af5e9
--- /dev/null
+++ b/mini/config/chroot_local-packages
@@ -0,0 +1 @@
+../../webconverger/config/chroot_local-packages
\ No newline at end of file
diff --git a/webconverger/config/chroot_local-packages/flashplugin-nonfree_1.6.3_i386.deb b/webconverger/config/chroot_local-packages/flashplugin-nonfree_1.6.3_i386.deb
new file mode 100644
index 0000000..6fa2547
Binary files /dev/null and b/webconverger/config/chroot_local-packages/flashplugin-nonfree_1.6.3_i386.deb differ
diff --git a/webconverger/config/chroot_local-packageslists/japanese b/webconverger/config/chroot_local-packageslists/japanese
index 1b47bc8..99c4f39 100644
--- a/webconverger/config/chroot_local-packageslists/japanese
+++ b/webconverger/config/chroot_local-packageslists/japanese
@@ -1,4 +1,3 @@
 iceweasel-l10n-ja
-xpdf-japanese
 ttf-vlgothic
 scim-anthy scim-uim scim-skk scim-prime scim-canna scim-tables-ja

-- 
debian-live/config-webc