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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 71eafde8eba0890f7dfe782cda209135ce4fe7ad
Author: Kai Hendry <hendry at iki.fi>
Date:   Fri Aug 21 01:39:51 2009 +0200

    copy across sources.list

diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index a4fcf3a..d66f371 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -45,10 +45,8 @@ d-i    passwd/root-login        boolean    true
 #d-i    passwd/root-password-crypted    passwd    *
 d-i    passwd/root-password        password    webc
 d-i    passwd/root-password-again    password    webc
-
 d-i     popularity-contest/participate  boolean false
 
 # Process custom postinst
 d-i     preseed/late_command string sh  /cdrom/install/late_command.sh
-
 #d-i     debian-installer/add-kernel-opts        string   splash video=vesa:ywrap,mtrr vga=788 nosudo
diff --git a/webconverger/config/binary_local-includes/install/late_command.sh b/webconverger/config/binary_local-includes/install/late_command.sh
index 31322d5..df3733a 100644
--- a/webconverger/config/binary_local-includes/install/late_command.sh
+++ b/webconverger/config/binary_local-includes/install/late_command.sh
@@ -1,6 +1,4 @@
-#!/bin/sh
-
-set -e
+#!/bin/sh -e
 
 log () {
 	logger -t webconverger_late_cmd "$@"
@@ -14,14 +12,10 @@ 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
-# Generated path is wrong
-#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 "Setting Grub splash"
+cp /cdrom/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
@@ -30,5 +24,8 @@ in-target passwd --delete ${USER}
 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"
+cp /etc/apt/sources.list /target/etc/apt/sources.list
+
 log "Flushing filesystem buffers"
 sync

-- 
debian-live/config-webc