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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 5d53f5c3dac35f2cc901324e2612784f2730f4f9
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed May 21 22:36:09 2008 +0100

    Developed a little menu.lst for a custom grub menu

diff --git a/mini/config/binary b/mini/config/binary
index fec78f7..d09c196 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -6,7 +6,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -18,7 +18,7 @@ LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-#LH_BOOTLOADER="grub"
+LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
 # (Default: enabled)
diff --git a/webconverger/config/binary b/webconverger/config/binary
index f5ff0f2..9674f0e 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -6,7 +6,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -14,7 +14,7 @@ LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791"
 
 # $LH_BOOTAPPEND_INSTALL: set boot parameters
 # (Default: empty)
@@ -22,7 +22,7 @@ LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo"
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-#LH_BOOTLOADER="grub"
+LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
 # (Default: enabled)
@@ -71,7 +71,7 @@ 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
 # (Default: nfs)
@@ -139,4 +139,4 @@ LH_SYSLINUX_TIMEOUT="10"
 
 # $LH_USERNAME: set username
 # (Default: user)
-#LH_USERNAME="user"
+LH_USERNAME="webc"
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
index 1736da0..d4cd115 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -30,7 +30,7 @@ LH_UNION_FILESYSTEM="aufs"
 
 # $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LH_LINUX_FLAVOURS="486"
+#LH_LINUX_FLAVOURS="486"
 
 # $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
diff --git a/webconverger/config/chroot_local-packageslists/hd b/webconverger/config/chroot_local-packageslists/hd
deleted file mode 100644
index b7e1eb1..0000000
--- a/webconverger/config/chroot_local-packageslists/hd
+++ /dev/null
@@ -1 +0,0 @@
-grub
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index e82d148..a1f6e88 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -13,7 +13,7 @@ alsa-base alsa-oss alsa-utils
 
 # For upgrade, firewall et al. features
 live-initscripts
-rsync
+#rsync
 
 webconverger-base
 webconverger-archive-keyring
diff --git a/webconverger/menu.lst b/webconverger/menu.lst
new file mode 100644
index 0000000..2377f3f
--- /dev/null
+++ b/webconverger/menu.lst
@@ -0,0 +1,21 @@
+default 0
+timeout     10
+color cyan/blue white/blue
+splashimage /boot/grub/splash.xpm.gz
+## sudo cp menu.lst binary/boot/grub/menu.lst && sudo rm .stage/binary_iso && sudo lh_binary_iso
+
+
+title		Webconverger China
+kernel		/live/vmlinuz-2.6.24-1-486 boot=live quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=zh_CN.UTF-8 keyb=zh
+s
+initrd		/live/initrd.img-2.6.24-1-486
+
+title		Webconverger Japan
+kernel		/live/vmlinuz-2.6.24-1-486 boot=live quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ja_JP.UTF-8
+s
+initrd		/live/initrd.img-2.6.24-1-486
+
+title		Webconverger Korea
+kernel		/live/vmlinuz-2.6.24-1-486 boot=live quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ko_KR.UTF-8
+s
+initrd		/live/initrd.img-2.6.24-1-486

-- 
debian-live/config-webc