From 14b04258ec8f877649de08ac8ebce445d2561e81 2019-03-01 13:19:02
From: Gérard Vidal <g-vidal@users.noreply.github.com>
Date: 2019-03-01 13:19:02
Subject: [PATCH] Merge pull request #23 from drtyhlpr/master

merging  main repository
---

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 33b3cc1..55f1592 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -24,7 +24,7 @@ chroot_exec apt-get -qq -y -u dist-upgrade
 
 # Install additional packages
 if [ "$APT_INCLUDES_LATE" ] ; then
-  chroot_exec apt-get -qq -y install "$(echo "$APT_INCLUDES_LATE" |tr , ' ')"
+  chroot_exec apt-get -qq -y install $(echo "$APT_INCLUDES_LATE" |tr , ' ')
 fi
 
 # Install Debian custom packages
diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh
index 9817d7a..79496f5 100644
--- a/bootstrap.d/12-locale.sh
+++ b/bootstrap.d/12-locale.sh
@@ -7,6 +7,14 @@
 
 # Install and setup timezone
 echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
+if [ -f "${ETC_DIR}/localtime" ]; then
+    # 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created
+    #    because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.
+    # 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata' 
+    #    will ignore the our timezone set in '/etc/timezone'.
+    # 3. Removing /etc/localtime will solve this.
+    rm -f "${ETC_DIR}/localtime"
+fi
 chroot_exec dpkg-reconfigure -f noninteractive tzdata
 
 # Install and setup default locale and keyboard configuration
diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 0aacfed..b7a8684 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -127,7 +127,7 @@ if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
 
     # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
     as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
-    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
+    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
 
     # Set permissions
     chown -R root:root "${R}/tmp/pi-bluetooth"
@@ -146,7 +146,7 @@ if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
     # Install Firmware Flash file and apropiate licence
     mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
     install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
-    install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+    install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/BCM43430A1.hcd"
     install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
     install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
 
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index a530b04..b4abb59 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -188,7 +188,7 @@ KERNEL_CCACHE=${KERNEL_CCACHE:=false}
 KERNEL_ZSWAP=${KERNEL_ZSWAP:=false}
 KERNEL_VIRT=${KERNEL_VIRT:=false}
 KERNEL_BPF=${KERNEL_BPF:=false}
-KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=powersave}
+KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=ondemand}
 KERNEL_SECURITY=${KERNEL_SECURITY:=false}
 KERNEL_NF=${KERNEL_NF:=false}