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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 67bcfcbf41da70348c8abe245803261ed80f04b7
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Sep 13 12:10:48 2009 +0200

    remove grub1 splash hook

diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index 1997981..c02fbae 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -1,4 +1,5 @@
 # preseed.cfg for Webconverger
+# Lenny example: http://www.debian.org/releases/lenny/example-preseed.txt
 
 d-i mirror/country string manual
 d-i mirror/http/hostname string cdn.debian.net
@@ -36,6 +37,9 @@ d-i    time/zone    select    Europe/London
 d-i    clock-setup/utc    boolean    true
 #d-i    kbd-chooser/method    select    American English
 
+# Disable LVM
+d-i partman-auto/method string regular
+
 # User Creation
 ####################################################################
 
diff --git a/webconverger/config/binary_local-includes/install/late_command.sh b/webconverger/config/binary_local-includes/install/late_command.sh
index d60ac8f..fecd8fb 100644
--- a/webconverger/config/binary_local-includes/install/late_command.sh
+++ b/webconverger/config/binary_local-includes/install/late_command.sh
@@ -6,19 +6,12 @@ log () {
 
 USER="webc"
 
-log $(mount)
-
 log "Removing packages"
 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 /mnt/boot/grub/splash.xpm.gz /target/boot/grub/splash.xpm.gz
-in-target update-grub
-echo "splashimage /boot/grub/splash.xpm.gz" >> /target/boot/grub/menu.lst
-
 log "Remove passwords"
 #in-target passwd --delete root
 #in-target passwd --delete ${USER}
@@ -27,6 +20,8 @@ log "Setting up autologin"
 sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${USER} </dev/\2 >/dev/\2 2>\&1|" /target/etc/inittab
 
 log "Setting up Webconverger sources.list"
+log $(mount)
+mount
 cp /mnt/etc/apt/sources.list /target/etc/apt/sources.list
 
 log "Flushing filesystem buffers"

-- 
debian-live/config-webc