| @@ -176,7 +176,7 Install and enable OpenSSH service. The default configuration of the service doe | |||
|
|
176 | 176 | 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. |
|
|
177 | 177 | |
|
|
178 | 178 | ##### `ENABLE_WIRELESS`=false |
|
|
179 |
Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/ |
|
|
|
179 | 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`. | |
|
|
180 | 180 | |
|
|
181 | 181 | ##### `ENABLE_RSYSLOG`=true |
|
|
182 | 182 | If set to false, disable and uninstall rsyslog (so logs will be available only |
| @@ -28,10 +28,10 if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then | |||
|
|
28 | 28 | chroot_exec update-locale LANG="${DEFLOCAL}" |
|
|
29 | 29 | |
|
|
30 | 30 | # Install and setup default keyboard configuration |
|
|
31 | if [ "$XKB_MODEL" != "" ] ; then | |
|
|
31 | if [ "$XKB_MODEL" != "pc105" ] ; then | |
|
|
32 | 32 | sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" |
|
|
33 | 33 | fi |
|
|
34 | if [ "$XKB_LAYOUT" != "" ] ; then | |
|
|
34 | if [ "$XKB_LAYOUT" != "us" ] ; then | |
|
|
35 | 35 | sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" |
|
|
36 | 36 | fi |
|
|
37 | 37 | if [ "$XKB_VARIANT" != "" ] ; then |
|
|
1 | NO CONTENT: modified file |
| @@ -107,7 +107,7 if [ "$ENABLE_WIRELESS" = true ] ; then | |||
|
|
107 | 107 | as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin" |
|
|
108 | 108 | as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt" |
|
|
109 | 109 | as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob" |
|
|
110 | else | |
|
|
110 | elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then | |
|
|
111 | 111 | # Fetch firmware binary blob for RPI3 |
|
|
112 | 112 | as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin" |
|
|
113 | 113 | as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt" |
| @@ -116,7 +116,7 if [ "$ENABLE_WIRELESS" = true ] ; then | |||
|
|
116 | 116 | # Move downloaded firmware binary blob |
|
|
117 | 117 | if [ "$RPI_MODEL" = 3P ] ; then |
|
|
118 | 118 | mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/" |
|
|
119 | else | |
|
|
119 | elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then | |
|
|
120 | 120 | mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/" |
|
|
121 | 121 | fi |
|
|
122 | 122 | |
| @@ -127,7 +127,7 if [ "$ENABLE_WIRELESS" = true ] ; then | |||
|
|
127 | 127 | if [ "$RPI_MODEL" = 3P ] ; then |
|
|
128 | 128 | chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."* |
|
|
129 | 129 | chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."* |
|
|
130 | else | |
|
|
130 | elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then | |
|
|
131 | 131 | chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."* |
|
|
132 | 132 | chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."* |
|
|
133 | 133 | fi |
| @@ -10,9 +10,9 if [ "$ENABLE_IPTABLES" = true ] ; then | |||
|
|
10 | 10 | mkdir -p "${ETC_DIR}/iptables" |
|
|
11 | 11 | |
|
|
12 | 12 | # make sure iptables-legacy,iptables-legacy-restore and iptables-legacy-save are the used alternatives |
|
|
13 | chroot_exec update-alternatives --verbose --set iptables /usr/bin/iptables-legacy | |
|
|
14 | chroot_exec update-alternatives --verbose --set iptables-save /usr/bin/iptables-legacy-save | |
|
|
15 | chroot_exec update-alternatives --verbose --set iptables-restore /usr/bin/iptables-legacy-restore | |
|
|
13 | chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy | |
|
|
14 | chroot_exec update-alternatives --verbose --set iptables-save /usr/sbin/iptables-legacy-save | |
|
|
15 | chroot_exec update-alternatives --verbose --set iptables-restore /usr/sbin/iptables-legacy-restore | |
|
|
16 | 16 | |
|
|
17 | 17 | # Install iptables systemd service |
|
|
18 | 18 | install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service" |
| @@ -315,11 +315,11 if [ "$BUILD_KERNEL" = true ] ; then | |||
|
|
315 | 315 | if [ "$RELEASE_ARCH" = "armhf" ]; then |
|
|
316 | 316 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf" |
|
|
317 | 317 | fi |
|
|
318 | fi | |
|
|
318 | 319 |
|
|
|
319 | 320 |
|
|
|
320 | 321 |
|
|
|
321 | 322 |
|
|
|
322 | fi | |
|
|
323 | 323 | |
|
|
324 | 324 | # Add libncurses5 to enable kernel menuconfig |
|
|
325 | 325 | if [ "$KERNEL_MENUCONFIG" = true ] ; then |
| @@ -457,7 +457,7 if [ "$ENABLE_MINBASE" = true ] ; then | |||
|
|
457 | 457 | fi |
|
|
458 | 458 | |
|
|
459 | 459 | # Add required locales packages |
|
|
460 | if [ "$DEFLOCAL" != "en_US.UTF-8" ] ; then | |
|
|
460 | if [ "$DEFLOCAL" != "en_US.UTF-8" ] || ([ -n XKB_MODEL ] || [ -n XKB_LAYOUT ] || [ -n XKB_VARIANT ] || [ -n XKB_OPTIONS ]); then | |
|
|
461 | 461 | APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup" |
|
|
462 | 462 | fi |
|
|
463 | 463 | |
| @@ -473,7 +473,7 fi | |||
|
|
473 | 473 | |
|
|
474 | 474 | # Add iptables IPv4/IPv6 package |
|
|
475 | 475 | if [ "$ENABLE_IPTABLES" = true ] ; then |
|
|
476 | APT_INCLUDES="${APT_INCLUDES},iptables" | |
|
|
476 | APT_INCLUDES="${APT_INCLUDES},iptables,iptables-persistent" | |
|
|
477 | 477 | fi |
|
|
478 | 478 | |
|
|
479 | 479 | # Add openssh server package |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
