[SCM] live-config branch, debian-next, updated. debian/3.0_b1-1-2-g8999968

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8999968b0ce6f4999a5eea5837a13da643e8dfab
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 26 16:35:09 2012 +0200

    Removing special hack for some arm boards in boot initscript.
    
    Even if we don't necessarily want to eject the medium
    (which shouldn't be a default anyway, those users that
    don't want it, shall use one of the boot parameters to
    prevent it), we still want the reboot caching stuff.

diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index 5e117f7..357c438 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -141,21 +141,6 @@ Eject ()
 	fi
 }
 
-# Don't prompt to eject the SD card on Babbage board, where we reuse it
-# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
-# (archdetect), but since this is mostly only relevant for
-# installations, who cares ...
-if [ -x "$(which archdetect 2>/dev/null)" ]
-then
-	subarch="$(archdetect)"
-
-	case $subarch in
-		arm*/imx51)
-			return 0
-			;;
-	esac
-fi
-
 echo "live-boot: caching reboot files..."
 
 prompt=1

-- 
live-config