From 0f2694da32113cdb11db47d8a6c3c8bdbe36e4c8 2020-12-25 21:22:57 From: drtyhlpr Date: 2020-12-25 21:22:57 Subject: [PATCH] Merge pull request #221 from burnbabyburn/patch-1 Update 15-rpi-config.sh --- diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh index 6278b50..63f556c 100644 --- a/bootstrap.d/15-rpi-config.sh +++ b/bootstrap.d/15-rpi-config.sh @@ -20,7 +20,7 @@ if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then cp "${RPI_FIRMWARE_DIR}"/boot/fixup4x.dat "${BOOT_DIR}"/fixup4x.dat cp "${RPI_FIRMWARE_DIR}"/boot/start4cd.elf "${BOOT_DIR}"/start4cd.elf cp "${RPI_FIRMWARE_DIR}"/boot/start4db.elf "${BOOT_DIR}"/start4db.elf - cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4x.elf + cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4.elf cp "${RPI_FIRMWARE_DIR}"/boot/start4x.elf "${BOOT_DIR}"/start4x.elf else # Create temporary directory for boot binaries @@ -40,7 +40,7 @@ else as_nobody wget -q -O "${temp_dir}/fixup4x.dat" "${FIRMWARE_URL}/fixup4x.dat" as_nobody wget -q -O "${temp_dir}/start4cd.elf" "${FIRMWARE_URL}/start4cd.elf" as_nobody wget -q -O "${temp_dir}/start4db.elf" "${FIRMWARE_URL}/start4db.elf" - as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf" + as_nobody wget -q -O "${temp_dir}/start4.elf" "${FIRMWARE_URL}/start4.elf" as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf" # Move downloaded boot binaries diff --git a/bootstrap.d/99-reduce.sh b/bootstrap.d/99-reduce.sh index 3b7fc57..6feaf0f 100644 --- a/bootstrap.d/99-reduce.sh +++ b/bootstrap.d/99-reduce.sh @@ -75,7 +75,11 @@ if [ "$ENABLE_REDUCE" = true ] ; then # Remove sound utils and libraries if [ "$ENABLE_SOUND" = false ] ; then - chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data + if [ "$ENABLE_BLUETOOTH" = false ] ; then + chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data + else + chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 + fi fi # Remove GPU kernels @@ -91,6 +95,9 @@ if [ "$ENABLE_REDUCE" = true ] ; then rm -f "${R}/boot/vmlinuz-*" rm -f "${R}/boot/initrd.img-*" fi + + #Reduce BOOT + #Only necessary files for my gen pi # Clean APT list of repositories rm -fr "${R}/var/lib/apt/lists/*"