diff --git a/mk_mmc.sh b/mk_mmc.sh index 3aa3be6..8d4911d 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -84,15 +84,15 @@ QUANTAL_ARMHF_MD5SUM="fae2369f22b507080bf7c004de847a10" SQUEEZE_NETIMAGE="20110106+squeeze4+b1" SQUEEZE_MD5SUM="03a43fb3440e01aeba1b4c9d2dbd946a" -#08-May-2012 +#12-Jul-2012 #http://ftp.us.debian.org/debian/dists/wheezy/main/installer-armel/ -WHEEZY_ARMEL_NETIMAGE="20120508" -WHEEZY_ARMEL_MD5SUM="33ca7f96728cfc78e5f4330b6de2b07d" +WHEEZY_ARMEL_NETIMAGE="20120712" +WHEEZY_ARMEL_MD5SUM="ae0a65fdb30565c6dcfe582f3483a7ce" -#08-May-2012 +#12-Jul-2012 #http://ftp.us.debian.org/debian/dists/wheezy/main/installer-armhf/ -WHEEZY_ARMHF_NETIMAGE="20120508" -WHEEZY_ARMHF_MD5SUM="cb567dca9d49b9483163941d59b25a15" +WHEEZY_ARMHF_NETIMAGE="20120712" +WHEEZY_ARMHF_MD5SUM="16b5148acb0b0b80b76f8791c6ece9f6" DIR="$PWD" TEMPDIR=$(mktemp -d) @@ -1718,16 +1718,10 @@ function check_distro { wheezy-armel) DIST="wheezy" ARCH="armel" - - #Same keymap bug, but squeeze fix doesnt work - SERIAL_MODE=1 ;; wheezy-armhf) DIST="wheezy" ARCH="armhf" - - #Same keymap bug, but squeeze fix doesnt work - SERIAL_MODE=1 ;; *) IN_VALID_DISTRO=1 diff --git a/scripts/wheezy-preseed.cfg b/scripts/wheezy-preseed.cfg index 0a09070..4eb2912 100644 --- a/scripts/wheezy-preseed.cfg +++ b/scripts/wheezy-preseed.cfg @@ -3,18 +3,6 @@ d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true -# Squeeze/Wheezy only: (doesn't seem to effect maverick/natty/oneiric/precise..) -# (working around a gcc/bug, where netinstall locks up here, cross compiled *.deb would work fine...) -# Note: this workaround is disabled in serial mode -d-i console-tools/archs string skip-config -d-i debian-installer/locale string en_US -d-i console-keymaps-at/keymap select us - -#Just for wheezy armhf (should be fixed in alpha2) -d-i mirror/country string manual -d-i mirror/http/hostname string ftp.us.debian.org -d-i mirror/http/directory string /debian - # Individual additional packages to install d-i pkgsel/include string uboot-mkimage pastebinit initramfs-tools wget firmware-linux ntpdate bash fbset