From 8c0591606873189ee0078b764f2f2a6c62232c03 2019-02-20 23:39:33
From: Unknown <xyz258@abwesend.de>
Date: 2019-02-20 23:39:33
Subject: [PATCH] 0


---

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 8c0c5a2..55f1592 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -11,6 +11,13 @@ if [ -z "$APT_PROXY" ] ; then
   sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
 fi
 
+# Install APT sources.list
+install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
+
+# Use specified APT server and release
+sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
+sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
+
 # Upgrade package index and update all installed packages and changed dependencies
 chroot_exec apt-get -qq -y update
 chroot_exec apt-get -qq -y -u dist-upgrade
diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index 1a82ada..607ec1d 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -260,7 +260,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
         set_kernel_config CONFIG_CRYPTO_AES_ARM64_NEON_BLK m
         set_kernel_config CONFIG_CRYPTO_CHACHA20_NEON m
         set_kernel_config CONFIG_CRYPTO_AES_ARM64_BS m
-		echo CONFIG_SYSTEM_TRUSTED_KEYS="" >> .config
+		set_kernel_config SYSTEM_TRUSTED_KEYS
       fi
 
       # Netfilter kernel support See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index a8c521f..6c4d90a 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -57,7 +57,7 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then
       sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
 
 	  # Regenerate initramfs
-	  chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
+	  #chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
     fi
 
 	if [ "$CRYPTFS_DROPBEAR" = true ]; then
diff --git a/files/apt/sources.list b/files/apt/sources.list
index ffc2c9b..07e52dc 100644
--- a/files/apt/sources.list
+++ b/files/apt/sources.list
@@ -1,8 +1,8 @@
-deb http://ftp.debian.org/debian jessie main contrib
-#deb-src http://ftp.debian.org/debian jessie main contrib
+deb http://ftp.debian.org/debian stretch main contrib
+#deb-src http://ftp.debian.org/debian stretch main contrib
 
-deb http://ftp.debian.org/debian/ jessie-updates main contrib
-#deb-src http://ftp.debian.org/debian/ jessie-updates main contrib
+deb http://ftp.debian.org/debian/ stretch-updates main contrib
+#deb-src http://ftp.debian.org/debian/ stretch-updates main contrib
 
-deb http://security.debian.org/ jessie/updates main contrib
-#deb-src http://security.debian.org/ jessie/updates main contrib
+deb http://security.debian.org/ stretch/updates main contrib
+#deb-src http://security.debian.org/ stretch/updates main contrib