[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 18dbc1ae4f3b022a5cf155109814dca4778da0e9

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 18dbc1ae4f3b022a5cf155109814dca4778da0e9
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Feb 22 23:24:55 2009 +0100

    --force-yes added to apt-get install
    
    Michele found this problem to exist.

diff --git a/install.sh b/install.sh
index d6e9521..ec8e628 100644
--- a/install.sh
+++ b/install.sh
@@ -686,7 +686,7 @@ action_fso () {
 	# TODO
 	echo "Installing FSO-specific packages"
 	chroot $INST_DIR /bin/sh -e <<__END_CHROOT__
-apt-get --yes install $FSO_PACKAGES
+apt-get --yes --force-yes install $FSO_PACKAGES
 apt-get clean
 __END_CHROOT__
 	echo "I: FSO packages installed"
@@ -851,7 +851,7 @@ __END__
 
 	if [ -f "$WPA_SUPPLICANT_CONF" ]; then
 		echo " * Installing wpasupplicant, wireless-tools and udhcpc"
-		chroot $INST_DIR apt-get --yes install wpasupplicant wireless-tools udhcpc
+		chroot $INST_DIR apt-get --yes --force-yes install wpasupplicant wireless-tools udhcpc
 		echo " * $WPA_SUPPLICANT_CONF copied from this machine"
 		cat >$INST_DIR$WPA_SUPPLICANT_CONF <$WPA_SUPPLICANT_CONF
 	fi
@@ -883,7 +883,7 @@ EOMATCHBOX
 action_kernel () {
 	echo "Installing kernel package"
 
-	intern_cmd="apt-get --yes install linux-image-2.6.28-openmoko-gta02"
+	intern_cmd="apt-get --yes --force-yes install linux-image-2.6.28-openmoko-gta02"
 
 	if [ "$SD_PART1_FS" = "vfat" ]; then
 		intern_bootmountpoint=$(mount | grep "^${SD_DEVICE}p1"| cut -f3 -d\ )

-- 
Various non-packaged files