diff -Nru di-netboot-assistant-0.58/debian/changelog di-netboot-assistant-0.59/debian/changelog --- di-netboot-assistant-0.58/debian/changelog 2018-11-11 10:02:27.000000000 +0000 +++ di-netboot-assistant-0.59/debian/changelog 2018-12-15 15:31:15.000000000 +0000 @@ -1,3 +1,10 @@ +di-netboot-assistant (0.59) unstable; urgency=medium + + * Allow old and recent installer archives: Automatically detect + installer archive structure. + + -- Andreas B. Mundt Sat, 15 Dec 2018 18:31:15 +0300 + di-netboot-assistant (0.58) unstable; urgency=medium * Signature check: Allow for signatures with missing public keys if diff -Nru di-netboot-assistant-0.58/di-netboot-assistant di-netboot-assistant-0.59/di-netboot-assistant --- di-netboot-assistant-0.58/di-netboot-assistant 2018-11-11 10:02:27.000000000 +0000 +++ di-netboot-assistant-0.59/di-netboot-assistant 2018-12-15 15:31:15.000000000 +0000 @@ -1028,11 +1028,11 @@ fi : tar_opts="$dl_file --directory $expand_dir --no-same-permissions" - ## archives are slightly different depending on arch: - if [ "$arch" = "armhf" ] ; then - nstrp=2 - else + ## Some older archives have no leading './' directory (arch dependent): + if tar --list -f "$dl_file" | grep -q "^./" ; then nstrp=3 + else + nstrp=2 fi case "$(echo "$dl_file" | sed -e 's#^.*/##' )" in *.tar.gz)