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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c5d58c536273273f8a7f31fc408ed0a6a0207012
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Feb 28 14:00:06 2009 +0100

    Not attempting uboot for vfat boot partition.

diff --git a/install.sh b/install.sh
index c78cf4a..14c2387 100755
--- a/install.sh
+++ b/install.sh
@@ -1040,9 +1040,9 @@ action_uboot () {
 	echo "Modifying U-Boot bootloader menu"
 
 	if [ "$SD_PART1_FS" = "vfat" ]; then
-		echo "E: when using $SD_PART1_FS as filesystem for the first microSD card"
-		echo "   partition, you should not modify the U-Boot environment"
-		exit 1
+		echo "W: When using $SD_PART1_FS as filesystem for the first microSD card"
+		echo "   partition, you should not modify the U-Boot environment."
+		return 1
 	fi
 
 	cat > "$INST_DIR/root/uboot_menu.in" <<'__END__'
@@ -1194,20 +1194,6 @@ do
 			assignVariablename="WITH_WIFI"
 			;;
 
-		 "minimal")
-			action_testing
-			action_time
-			action_partition
-			action_format
-			action_mount
-			action_debian
-			action_apt
-			action_fso
-			action_configuration
-			action_kernel
-			action_uboot
-			action_unmount
-			;;
 		 "all")
 			action_testing
 			action_time
@@ -1220,7 +1206,11 @@ do
 			action_configuration
 			action_games
 			action_kernel
-			action_uboot
+			if [ "vfat" == "SD_PART1_FS" ]; then
+				echo "Skipping uboot modification since boot partition is of type '$SD_PART1_FS'."
+			else
+				action_uboot
+			fi
 			action_unmount
 			;;
 		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"games")

-- 
Various non-packaged files