Support for Tails 4.8; Small improvement to not update other apt sour…

…ce lists when there's no extras.sh script to run

HVM_VERSION

@@ -1 +1 @@
-1.2.6
+1.3.0

SUPPORTED_TAILS_VERSIONS

@@ -1,5 +1 @@
-4.4 - 20200311
-4.4.1 - 20200322
-4.5 - 20200406
-4.6 - 20200504
-4.7 - 20200601
+4.8 - 20200629

lib/assets/hiddenvm.list

@@ -1,6 +1,6 @@
 # Snapshot archive sources for the currently supported Tails version
-deb [check-valid-until=no] tor+http://snapshot.debian.org/archive/debian/20200213T231921Z/ buster main contrib
-deb [check-valid-until=no] tor+http://snapshot.debian.org/archive/debian/20200213T231921Z/ sid main contrib
+deb [check-valid-until=no] tor+http://snapshot.debian.org/archive/debian/20200610T152955Z/ buster main contrib
+deb [check-valid-until=no] tor+http://snapshot.debian.org/archive/debian/20200610T152955Z/ testing main contrib
 
 # VirtualBox (release should match whatever Tails is using)
 deb [trusted=yes] tor+http://download.virtualbox.org/virtualbox/debian buster contrib

lib/packages.sh

@@ -27,7 +27,7 @@ LAST_PKG_CACHE_PRUNE_DATE_FILE="${CACHE_DIR}/last-pkg-cache-prune"
 PKG_CACHE_PRUNE_FREQ_DAYS=7
 LAST_TAILS_VERSION_FILE="${CACHE_DIR}/last-tails-version"
 LINUX_HEADERS_PKG="linux-headers-$(uname -r)"
-LINUX_HEADERS_RELEASE="sid"
+LINUX_HEADERS_RELEASE="testing"
 VBOX_PACKAGE_NAME="virtualbox-6.1"
 
 # SourceList is to replace /etc/apt/sources.list
@@ -62,7 +62,7 @@ install_packages() {
     # Install VirtualBox (note that this will create the vboxusers group and
     # build/install the VirtualBox kernel drivers)
     log "Install VirtualBox, prog-id=11"
-    sudo apt-get -q -y ${APT_OPTS_FOR_VBOX} install ${VBOX_PACKAGE_NAME}
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y ${APT_OPTS_FOR_VBOX} install ${VBOX_PACKAGE_NAME}
 }
 
 # If system packages were upgraded by linux-headers, the system may become unstable
@@ -169,6 +169,12 @@ should_apt_update_for_vbox() {
 }
 
 should_apt_update_for_other() {
+    local EXTRAS_SCRIPT="${HVM_HOME}/extras/extras.sh"
+    if [ ! -f "${EXTRAS_SCRIPT}" ]; then
+        log "Did not find 'extras' script - will not run 'apt-get update'"
+        return 1
+    fi
+
     should_apt_update "${APT_LIST_BACKUP_DIR_FOR_OTHER}" "${LAST_APT_UPDATE_DATE_FILE_FOR_OTHER}"
 }