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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 62eab303c2ff04c34873d76077d652d6eeb40b58
Author: Kai Hendry <hendry at iki.fi>
Date:   Mon Sep 7 00:31:48 2009 +0200

    fix mirror for build

diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index d66f371..1997981 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -49,4 +49,4 @@ 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
+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 df3733a..d60ac8f 100644
--- a/webconverger/config/binary_local-includes/install/late_command.sh
+++ b/webconverger/config/binary_local-includes/install/late_command.sh
@@ -6,6 +6,8 @@ log () {
 
 USER="webc"
 
+log $(mount)
+
 log "Removing packages"
 in-target apt-get remove --yes aufs-modules-* user-setup
 
@@ -13,19 +15,19 @@ 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
+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}
+#in-target passwd --delete root
+#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
+cp /mnt/etc/apt/sources.list /target/etc/apt/sources.list
 
 log "Flushing filesystem buffers"
 sync
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index e4e194d..b207c92 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-MIRROR_DEBIAN="ftp://mirror.hetzner.de/ftp.de.debian.org/debian/"
+#MIRROR_DEBIAN="ftp://mirror.hetzner.de/ftp.de.debian.org/debian/"
+MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
 
 lh_config noautoconfig \
 	--apt-recommends disabled \

-- 
debian-live/config-webc