Raspi2-3_GenImage Commit - r326:0d104913b59f · Collaboration Tremplin des Sciences

Merge pull request #155 from burnbabyburn/fixes...

drtyhlpr -

r326:0d104913b59f

parent child

Context file:

r326:0d104913b59f

Collapse all files

README.md +1 -1

             Allow the installation of non-free Debian packages that do not comply with the DFSG. This is required to install closed-source firmware binary blobs.
             ##### `ENABLE_WIRELESS`=false
-            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
+            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
             ##### `ENABLE_RSYSLOG`=true
             If set to false, disable and uninstall rsyslog (so logs will be available only

bootstrap.d/12-locale.sh +2 -2

               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

bootstrap.d/15-rpi-config.sh 0 0

NO CONTENT: modified file

bootstrap.d/20-networking.sh +3 -3

               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               # Fetch firmware binary blob for RPI3
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
               # Move downloaded firmware binary blob
               if [ "$RPI_MODEL" = 3P ] ; then
               mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
               fi
               if [ "$RPI_MODEL" = 3P ] ; then
               chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
               chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               fi

bootstrap.d/21-firewall.sh +3 -3

               mkdir -p "${ETC_DIR}/iptables"
               # make sure iptables-legacy,iptables-legacy-restore and iptables-legacy-save are the used alternatives
-              chroot_exec update-alternatives --verbose --set iptables /usr/bin/iptables-legacy
+              chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
-              chroot_exec update-alternatives --verbose --set iptables-save /usr/bin/iptables-legacy-save
+              chroot_exec update-alternatives --verbose --set iptables-save /usr/sbin/iptables-legacy-save
-              chroot_exec update-alternatives --verbose --set iptables-restore /usr/bin/iptables-legacy-restore
+              chroot_exec update-alternatives --verbose --set iptables-restore /usr/sbin/iptables-legacy-restore
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"

rpi23-gen-image.sh +3 -3

                 if [ "$RELEASE_ARCH" = "armhf" ]; then
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
                 fi
+              fi
               if [ "$RELEASE_ARCH" = "arm64" ]; then
                 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
               fi
             fi
-            fi
             # Add libncurses5 to enable kernel menuconfig
             if [ "$KERNEL_MENUCONFIG" = true ] ; then
             fi
             # Add required locales packages
-            if [ "$DEFLOCAL" != "en_US.UTF-8" ] ; then
+            if [ "$DEFLOCAL" != "en_US.UTF-8" ] || ([ -n XKB_MODEL ] || [ -n XKB_LAYOUT ] ||  [ -n XKB_VARIANT ] ||  [ -n XKB_OPTIONS ]); then
               APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
             fi
             # Add iptables IPv4/IPv6 package
             if [ "$ENABLE_IPTABLES" = true ] ; then
-              APT_INCLUDES="${APT_INCLUDES},iptables"
+              APT_INCLUDES="${APT_INCLUDES},iptables,iptables-persistent"
             fi
             # Add openssh server package

General Comments 0

Écrire
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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