From e39066375d3a072f4caeaf99093e8c785fb5d73a 2018-11-10 22:46:38 From: Unknown Date: 2018-11-10 22:46:38 Subject: [PATCH] syntax bugfixes --- diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh index e69f44c..ac342ef 100644 --- a/bootstrap.d/12-locale.sh +++ b/bootstrap.d/12-locale.sh @@ -28,10 +28,10 @@ if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then chroot_exec update-locale LANG="${DEFLOCAL}" # Install and setup default keyboard configuration - if [ "$XKB_MODEL" != "" ] ; then + if [ "$XKB_MODEL" != "pc105" ] ; then sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" fi - if [ "$XKB_LAYOUT" != "" ] ; then + if [ "$XKB_LAYOUT" != "us" ] ; then sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" fi if [ "$XKB_VARIANT" != "" ] ; then diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index c34bc0e..a17ad93 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -239,7 +239,7 @@ elif [ BUILD_KERNEL = false ] #"The Linux kernel "${COLLABORA_KERNEL}" and modules for use on ARMv7 kernel for Raspberry pi 2 model B+" # nested if to be easily extended for more precompiled kernels if [ "$SET_ARCH" = 32 ] ; then - if [ RPI_MODEL = 2 ] ; then + if [ "$RPI_MODEL" = 2 ] ; then # Kernel installation chroot_exec apt-get -qq -y --no-install-recommends install linux-image-"${COLLABORA_KERNEL}" raspberrypi-bootloader-nokernel @@ -256,11 +256,15 @@ elif [ BUILD_KERNEL = false ] # Copy vmlinuz kernel to the boot directory install_readonly "${VMLINUZ}" "${BOOT_DIR}/${KERNEL_IMAGE}" fi - if [ RPI_MODEL = 0 ] || [ RPI_MODEL = 1 ] || [ RPI_MODEL = 1P ] ; then - # insert precompiled Kernel here + if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then + echo "error: no precompiled kernel found" + exit 1 + # insert precompiled Kernel code here fi #if [ "$SET_ARCH" = 64 ] else - # inset precompiled 64 bit kernel here + echo " error: no precompiled 64bit kernel found" + exit 1 + # inset precompiled 64 bit kernel code here fi fi diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh index c3f475d..ef44325 100644 --- a/bootstrap.d/15-rpi-config.sh +++ b/bootstrap.d/15-rpi-config.sh @@ -95,7 +95,7 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then fi # Disable RPi3 Bluetooth and restore ttyAMA0 serial device -if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then +if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"