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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 3cd516aa3d936f7a3829ae5b2b3e9c6b24fca3d6
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Oct 19 18:41:25 2008 +0200

    Keep sudo. New menu.lst for 2.6

diff --git a/webconverger/config/binary_local-includes/install/late_command.sh b/webconverger/config/binary_local-includes/install/late_command.sh
index 5eac4d1..2481c4b 100644
--- a/webconverger/config/binary_local-includes/install/late_command.sh
+++ b/webconverger/config/binary_local-includes/install/late_command.sh
@@ -9,7 +9,7 @@ log () {
 USER="webc"
 
 log "Removing packages"
-in-target apt-get remove --yes aufs-modules-* squashfs-modules-* user-setup sudo
+in-target apt-get remove --yes aufs-modules-* squashfs-modules-* user-setup
 
 log "Removing empty xorg.conf files"
 rm -f /target/etc/X11/xorg.conf*
diff --git a/webconverger/config/source b/webconverger/config/source
index a3935ba..b24fffc 100644
--- a/webconverger/config/source
+++ b/webconverger/config/source
@@ -2,7 +2,7 @@
 
 # $LH_SOURCE: set source option
 # (Default: disabled)
-# LH_SOURCE="enabled"
+#LH_SOURCE="enabled"
 
 # $LH_SOURCE_IMAGES: set image type
 # (Default: tar)
diff --git a/webconverger/menu.lst b/webconverger/menu.lst
index 2377f3f..e1988a8 100644
--- a/webconverger/menu.lst
+++ b/webconverger/menu.lst
@@ -1,21 +1,38 @@
-default 0
+default 1
 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
+# sudo cp menu.lst binary/boot/grub/menu.lst && sudo rm .stage/binary_iso && sudo lh_binary_iso
 
+title		Live:
+root
 
-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		Debian GNU/Linux - live
+kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs
+initrd		/live/initrd.img-2.6.26-1-486
+
+title		Debian GNU/Linux - live for China
+kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.sina.com.cn nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=zh_CN.UTF-8 keyb=zh
+initrd		/live/initrd.img-2.6.26-1-486
+
+title		Debian GNU/Linux - live for Korea
+kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.naver.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ko_KR.UTF-8
+initrd		/live/initrd.img-2.6.26-1-486
+
+title		Debian GNU/Linux - live for Japan
+kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.aplix.co.jp/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ja_JP.UTF-8
+initrd		/live/initrd.img-2.6.26-1-486
+
+
+
+
+
+title		Install:
+root
+
+title		Install Webconverger
+kernel		/install/gtk/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet
+initrd		/install/gtk/initrd.gz
+
 
-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