Raspi2-3_GenImage Commit - r258:85dd0b37705f · Collaboration Tremplin des Sciences

Fix: DTB for all

drtyhlpr -

r258:85dd0b37705f

parent child

Context file:

r258:85dd0b37705f

bootstrap.d/14-fstab.sh +1 -1

               # Add encrypted partition to crypttab and fstab
               install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
-              echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab"
+              echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 # Add usb/sda disk to crypttab

rpi23-gen-image.sh +2 -2

               KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
             fi
-            if [RPI_MODEL] = 0 || [RPI_MODEL = 1] || [RPI_MODEL = 1P]
+            if [ "$RPI_MODEL" = 0 || "$RPI_MODEL" = 1 || "$RPI_MODEL" = 1P ] ; then
             #RASPBERRY PI 1, PI ZERO, PI ZERO W, AND COMPUTE MODULE DEFAULT Kernel BUILD CONFIGURATION
               KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
               KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
             set +x
             # Set Raspberry Pi model specific configuration
-            elif [ "$RPI_MODEL" = 0 ] ; then
+            if [ "$RPI_MODEL" = 0 ] ; then
               DTB_FILE=${RPI2_DTB_FILE}
               UBOOT_CONFIG=${RPI2_UBOOT_CONFIG}
             elif [ "$RPI_MODEL" = 1 ] ; then

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages