diff --git a/debian/changelog b/debian/changelog index 27331dd5..d22075d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ debian-cd (3.1.26-buster) UNRELEASED; urgency=medium - + [ Steve McIntyre ] * Backports of fixes from debian-cd in unstable + Keep grub resolution in EFI boot, to avoid tiny fonts (closes: #935546). + Fix up ordering in imagesums + Add a "with firmware" text to the DISKINFO string when appropriate + Remove lilo-installer and elilo-installer for all arches + + tools/update_popcon: cope with lower-case HTTP headers too; Debian + just enabled http2 so this broke -- Samuel Thibault Fri, 23 Aug 2019 21:51:50 +0200 diff --git a/tools/update_popcon b/tools/update_popcon index 01685e27..e7681f6e 100755 --- a/tools/update_popcon +++ b/tools/update_popcon @@ -45,7 +45,7 @@ dl_file () { exit 1 fi HEAD_SIZE=`cat $TDIR/$DIST.head | \ - awk '/^Content-Length/ {gsub("\r","");print $2}'` + awk '/^.ontent-.ength/ {gsub("\r","");print $2}'` curl -L $capath -s $SITE/$DIST/by_inst > $TDIR/$DIST error=$? @@ -55,14 +55,14 @@ dl_file () { exit 1 fi - if [ $DL_SIZE != $HEAD_SIZE ] ; then + if [ "$DL_SIZE"x != "$HEAD_SIZE"x ] ; then echo "Failed to download correctly: expected $HEAD_SIZE bytes, but got $DL_SIZE bytes" >&2 exit 1 fi - LASTMOD=`awk '/^Last-Modified:/ { + LASTMOD=`awk '/^.ast-.odified:/ { gsub("\r","") - gsub("^Last-Modified: ","") + gsub("^.ast-.odified: ","") print $0}' $TDIR/$DIST.head` echo "$LASTMOD" }