Raspi2-3_GenImage Commit - r280:4b5b78dca118 · Collaboration Tremplin des Sciences

Merge pull request #143 from burnbabyburn/master...

drtyhlpr -

r280:4b5b78dca118

parent child

Context file:

r280:4b5b78dca118

bootstrap.d/15-rpi-config.sh +2 -2

             fi
             # Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-            if [ "$RPI_MODEL" = 3 ] ; 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"
             if [ "$ENABLE_SPI" = true ] ; then
               echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"
               echo "spi-bcm2708" >> "${R}/lib/modules-load.d/rpi2.conf"
-              if [ "$RPI_MODEL" = 3 ] ; then
+              if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
                 sed -i "s/spi-bcm2708/spi-bcm2835/" "${R}/lib/modules-load.d/rpi2.conf"
               fi
             fi

bootstrap.d/21-firewall.sh +6 -1

             if [ "$ENABLE_IPTABLES" = true ] ; then
               # Create iptables configuration directory
               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-save /usr/bin/iptables-legacy-save
+              chroot_exec update-alternatives --verbose --set iptables-restore /usr/bin/iptables-legacy-restore
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"

files/iptables/ip6tables.service +1 -1

             [Service]
             Type=oneshot
-            ExecStart=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+            ExecStart=/sbin/ip6tables-restore -w 5 /etc/iptables/ip6tables.rules
             ExecReload=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
             ExecStop=/etc/iptables/flush-ip6tables.sh
             RemainAfterExit=yes

files/iptables/iptables.service +1 -1

             [Service]
             Type=oneshot
-            ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules
+            ExecStart=/sbin/iptables-restore -w 5 /etc/iptables/iptables.rules
             ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules
             ExecStop=/etc/iptables/flush-iptables.sh
             RemainAfterExit=yes

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