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

[Kai Hendry]

The following commit has been merged in the master branch:
commit f49f96610625ff0fc4a3f722e6976df16d009fbd
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Aug 9 23:16:11 2009 +0200

    USB d-i install and live-initscripts

diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index 1bbecf2..9af324a 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -1,24 +1,18 @@
-# pressed.cfg for Webconverger
+# preseed.cfg for Webconverger
 
-# Installation Sources
-#d-i     mirror/http/hostname    string ftp.us.debian.org
-#d-i     mirror/http/directory   string /debian/
-#d-i     mirror/suite            string lenny
+d-i mirror/country string manual
+d-i mirror/http/hostname string cdn.debian.net
+d-i mirror/http/directory string /debian
+d-i mirror/suite string lenny
 
-# Post install APT setup (not working?? http://www.flickr.com/photos/hendry/3605150192/ )
-d-i     apt-setup/hostname              string   ftp.us.debian.org
+d-i     apt-setup/hostname              string   cdn.debian.net
 d-i     apt-setup/directory             string   /debian/
 d-i     apt-setup/another               boolean  false
 d-i     apt-setup/security-updates      boolean  true
 d-i     apt-setup/non-free              boolean  true
 d-i     apt-setup/contrib               boolean  true
 
-# Display note before rebooting; users might need to remove CD.
-# d-i     finish-install/reboot_in_progress note
-
-
 # Networking
-####################################################################
 
 # Network Configuration
 d-i     netcfg/get_hostname     string    webconverger
@@ -41,7 +35,6 @@ d-i     tzconfig/choose_country_zone_single boolean true
 d-i    time/zone    select    Europe/London
 d-i    clock-setup/utc    boolean    true
 #d-i    kbd-chooser/method    select    American English
-d-i    mirror/country    string    enter information manually
 
 # User Creation
 ####################################################################
@@ -53,13 +46,6 @@ d-i    passwd/root-login        boolean    true
 d-i    passwd/root-password        password    webc
 d-i    passwd/root-password-again    password    webc
 
-# Mortal User
-#d-i    passwd/make-user                boolean    false
-#d-i    passwd/make-user                boolean true
-#d-i    passwd/user-fullname            string    Debian User
-#d-i    passwd/username                 string    webc
-#d-i    passwd/user-password passwd webc
-
 d-i     popularity-contest/participate  boolean false
 
 # Process custom postinst
diff --git a/webconverger/config/binary_local-includes/install/gtk/initrd.gz b/webconverger/config/binary_local-includes/install/gtk/initrd.gz
new file mode 100644
index 0000000..bce5947
Binary files /dev/null and b/webconverger/config/binary_local-includes/install/gtk/initrd.gz differ
diff --git a/webconverger/config/binary_local-includes/install/gtk/vmlinuz b/webconverger/config/binary_local-includes/install/gtk/vmlinuz
new file mode 100644
index 0000000..b8ad359
Binary files /dev/null and b/webconverger/config/binary_local-includes/install/gtk/vmlinuz differ
diff --git a/webconverger/config/binary_local-includes/install/initrd.gz b/webconverger/config/binary_local-includes/install/initrd.gz
new file mode 100644
index 0000000..17308c9
Binary files /dev/null and b/webconverger/config/binary_local-includes/install/initrd.gz differ
diff --git a/webconverger/config/binary_local-includes/install/late_command.sh b/webconverger/config/binary_local-includes/install/late_command.sh
index 8d1d79c..31322d5 100644
--- a/webconverger/config/binary_local-includes/install/late_command.sh
+++ b/webconverger/config/binary_local-includes/install/late_command.sh
@@ -14,14 +14,14 @@ in-target apt-get remove --yes aufs-modules-* user-setup
 log "Removing empty xorg.conf files"
 rm -f /target/etc/X11/xorg.conf*
 
-log "Setting Grub splash"
-cp /cdrom/boot/grub/splash.xpm.gz /target/boot/grub/splash.xpm.gz
-in-target update-grub
+#log "Setting Grub splash"
+#cp /cdrom/boot/grub/splash.xpm.gz /target/boot/grub/splash.xpm.gz
+#in-target update-grub
 # Generated path is wrong
-sed -i -e 's|//grub/splash.xpm.gz|/boot/grub/splash.xpm.gz|' /target/boot/grub/menu.lst
+#sed -i -e 's|//grub/splash.xpm.gz|/boot/grub/splash.xpm.gz|' /target/boot/grub/menu.lst
 
-log "Workaround for older live-initramfs versions"
-in-target chown -R 1000:1000 /home/${USER}
+#log "Workaround for older live-initramfs versions"
+#in-target chown -R 1000:1000 /home/${USER}
 
 log "Remove passwords"
 in-target passwd --delete root
diff --git a/webconverger/config/binary_local-includes/install/vmlinuz b/webconverger/config/binary_local-includes/install/vmlinuz
new file mode 100644
index 0000000..b8ad359
Binary files /dev/null and b/webconverger/config/binary_local-includes/install/vmlinuz differ
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 492ba6b..a5a2ffa 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -124,3 +124,6 @@ acpi-support-base
 
 # Getting the time right for certificate checks
 ntpdate
+
+# CJK helpers
+live-initscripts
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 3127d93..6134bdc 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -6,8 +6,8 @@ lh_config noautoconfig \
 	--apt-recommends disabled \
 	--bootappend-live "quiet homepage=http://portal.webconverger.com/%20http://webconverger.com nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot" \
 	--cache-stages "bootstrap rootfs" \
-	--debian-installer disabled \
-	--debian-installer-distribution daily \
+	--debian-installer live \
+	--debian-installer-distribution sid \
 	-k 486 \
 	-a i386 \
 	-f minimal \

-- 
debian-live/config-webc