Update to latest Debian testing for 0.10.0 series

systemd            240-6
qemu-system-x86    3.1+dfsg-4
linux-image-amd64  4.19+102
g++                8.2.0-2

2 files changed, 21 insertions, 8 deletions

diff --git a/bootstrap b/bootstrap
index e606c9f..8739eec 100755
--- a/bootstrap
+++ b/bootstrap
@@ -43,31 +43,32 @@ root="$btrfs/$id/buildos"
 #  - systemd-container seems to be required by host systemd-nspawn.
 #  - not installing linux-image-amd64 since building custom below
 #
-release="unstable"
+release="testing"
 components="main,contrib,non-free"
 mirror="http://deb.debian.org/debian/"
 #mirror="https://deb.debian.org/debian/"
 
 base_pkgs="locales,klibc-utils,sudo,systemd-container,udev"
-base_pkgs+=",kmod,linux-base,firmware-linux-free,irqbalance,pciutils,usbutils"
+base_pkgs+=",kmod,linux-base,firmware-linux-free,irqbalance"
 base_pkgs+=",intel-microcode,amd64-microcode"
+base_pkgs+=",pciutils,usbutils,dmidecode"
 base_pkgs+=",hdparm,btrfs-progs"
-base_pkgs+=",lm-sensors"
+base_pkgs+=",lm-sensors,smartmontools"
 
 base_pkgs+=",net-tools,iproute2,iptables,isc-dhcp-client"
 base_pkgs+=",ifupdown,bridge-utils,dnsmasq,ntp,postfix"
-base_pkgs+=",iputils-ping,wget,curl"
+base_pkgs+=",iputils-ping,wget,curl,ca-certificates"
 base_pkgs+=",openssh-client,openssh-server"
 base_pkgs+=",tftp-hpa,tftpd-hpa"
 
 base_pkgs+=",bzip2,xz-utils"
-base_pkgs+=",less,nano"
+base_pkgs+=",less,nano,time"
 
 base_pkgs+=",qemu-kvm,qemu-utils,socat"
 
 base_pkgs+=",g++,make,pkg-config"
 
-extra_pkgs="ca-certificates,time,dmidecode,smartmontools"
+extra_pkgs=""
 
 owd="$(pwd)"
 trap "{ cd '$owd'; exit 1; }" ERR
@@ -382,6 +383,8 @@ cd linux
 # Adjust configuration.
 #
 echo 'CONFIG_SYSTEM_TRUSTED_KEYS=""' >>.config
+echo 'CONFIG_BUILD_SALT=""'          >>.config
+echo 'CONFIG_MODULE_SIG=n'           >>.config
 
 # Adjust kernel command line size limit.
 #
diff --git a/bootstrap.txt b/bootstrap.txt
index c7f0bf1..025c4bf 100644
--- a/bootstrap.txt
+++ b/bootstrap.txt
@@ -5,6 +5,13 @@
   - systemd
   - qemu-system-x86
   - linux-image-amd64
+  - g++
+
+  If some of them are very recent (and thus likely to still have issues)
+  in unstable, consider using testing. See Debian Changelog for release
+  dates.
+
+  Check the current source (unstable/testing) and update is necessary.
 
 * Examining init changes:
 
@@ -16,9 +23,12 @@
 
     We currently only use init plus udev in scripts/init-{top,bottom}
 
-* Upgrade to latest debootstrap/keyrings from unstable.
+* Grep for 'bug' in init and bootstrap scripts, see if any bugs have
+  been fixed and corresponding workarounds can be removed.
+
+* Upgrade to latest debootstrap/keyrings from unstable (or testing).
 
-* Note: as of latest attempt, bootstrap of https was still broken
+* Note: as of latest attempt, bootstrap over https was still broken
 
 * Bootstrap: