| @@ -95,7 +95,7 if [ "$ENABLE_INITRAMFS" = true ] ; then | |||
|
|
95 | 95 | fi |
|
|
96 | 96 | |
|
|
97 | 97 | # Disable RPi3 Bluetooth and restore ttyAMA0 serial device |
|
|
98 | if [ "$RPI_MODEL" = 3 ] ; then | |
|
|
98 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then | |
|
|
99 | 99 | if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then |
|
|
100 | 100 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" |
|
|
101 | 101 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" |
| @@ -133,7 +133,7 fi | |||
|
|
133 | 133 | if [ "$ENABLE_SPI" = true ] ; then |
|
|
134 | 134 | echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt" |
|
|
135 | 135 | echo "spi-bcm2708" >> "${R}/lib/modules-load.d/rpi2.conf" |
|
|
136 | if [ "$RPI_MODEL" = 3 ] ; then | |
|
|
136 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then | |
|
|
137 | 137 | sed -i "s/spi-bcm2708/spi-bcm2835/" "${R}/lib/modules-load.d/rpi2.conf" |
|
|
138 | 138 | fi |
|
|
139 | 139 | fi |
| @@ -9,6 +9,11 if [ "$ENABLE_IPTABLES" = true ] ; then | |||
|
|
9 | 9 | # Create iptables configuration directory |
|
|
10 | 10 | mkdir -p "${ETC_DIR}/iptables" |
|
|
11 | 11 | |
|
|
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 | |
|
|
16 | ||
|
|
12 | 17 | # Install iptables systemd service |
|
|
13 | 18 | install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service" |
|
|
14 | 19 | |
| @@ -6,7 +6,7 Before=sysinit.target | |||
|
|
6 | 6 | |
|
|
7 | 7 | [Service] |
|
|
8 | 8 | Type=oneshot |
|
|
9 | ExecStart=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules | |
|
|
9 | ExecStart=/sbin/ip6tables-restore -w 5 /etc/iptables/ip6tables.rules | |
|
|
10 | 10 | ExecReload=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules |
|
|
11 | 11 | ExecStop=/etc/iptables/flush-ip6tables.sh |
|
|
12 | 12 | RemainAfterExit=yes |
| @@ -6,7 +6,7 Before=sysinit.target | |||
|
|
6 | 6 | |
|
|
7 | 7 | [Service] |
|
|
8 | 8 | Type=oneshot |
|
|
9 | ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules | |
|
|
9 | ExecStart=/sbin/iptables-restore -w 5 /etc/iptables/iptables.rules | |
|
|
10 | 10 | ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules |
|
|
11 | 11 | ExecStop=/etc/iptables/flush-iptables.sh |
|
|
12 | 12 | RemainAfterExit=yes |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
