Update config.txt at creation of image file, no more overwriting at auto-update.

Signed-off-by: jayofelony <oudshoorn.jeroen@gmail.com>

builder/data/32bit/boot/config.txt

@@ -1,67 +0,0 @@
-# For more options and information see
-# http://rptl.io/configtxt
-# Some settings may impact device functionality. See link above for details
-
-# Uncomment some or all of these to enable the optional hardware interfaces
-#dtparam=i2c_arm=on
-#dtparam=i2s=on
-#dtparam=spi=on
-
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
-# Additional overlays and parameters are documented
-# /boot/overlays/README
-
-# Automatically load overlays for detected cameras
-camera_auto_detect=1
-
-# Automatically load overlays for detected DSI displays
-display_auto_detect=1
-
-# Automatically load initramfs files, if found
-auto_initramfs=1
-
-# Enable DRM VC4 V3D driver
-dtoverlay=vc4-kms-v3d
-max_framebuffers=2
-
-# Don't have the firmware create an initial video= setting in cmdline.txt.
-# Use the kernel's default instead.
-disable_fw_kms_setup=1
-
-# Run in 64-bit mode
-arm_64bit=0
-
-# Disable compensation for displays with overscan
-disable_overscan=1
-
-# Run as fast as firmware / board allows
-arm_boost=1
-
-[cm4]
-# Enable host mode on the 2711 built-in XHCI USB controller.
-# This line should be removed if the legacy DWC2 controller is required
-# (e.g. for USB device mode) or if USB support is not required.
-otg_mode=1
-
-[all]
-dtoverlay=dwc2
-dtparam=i2c1=on
-dtparam=i2c_arm=on
-dtparam=spi=on
-gpu_mem=1
-dtoverlay=dwc2
-#dtoverlay=disable-wifi
-
-[pi0]
-dtoverlay=spi1-3cs
-#dtoverlay=disable-wifi
-
-[pi3]
-dtoverlay=spi1-3cs
-#dtoverlay=disable-wifi
-
-[pi4]
-dtoverlay=spi1-3cs
-#dtoverlay=disable-wifi

builder/data/64bit/boot/firmware/config.txt

@@ -1,70 +0,0 @@
-# For more options and information see
-# http://rptl.io/configtxt
-# Some settings may impact device functionality. See link above for details
-
-# Uncomment some or all of these to enable the optional hardware interfaces
-#dtparam=i2c_arm=on
-#dtparam=i2s=on
-#dtparam=spi=on
-
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
-# Additional overlays and parameters are documented
-# /boot/firmware/overlays/README
-
-# Automatically load overlays for detected cameras
-camera_auto_detect=1
-
-# Automatically load overlays for detected DSI displays
-display_auto_detect=1
-
-# Automatically load initramfs files, if found
-auto_initramfs=1
-
-# Enable DRM VC4 V3D driver
-dtoverlay=vc4-kms-v3d
-max_framebuffers=2
-
-# Don't have the firmware create an initial video= setting in cmdline.txt.
-# Use the kernel's default instead.
-disable_fw_kms_setup=1
-
-# Run in 64-bit mode
-arm_64bit=1
-
-# Disable compensation for displays with overscan
-disable_overscan=1
-
-# Run as fast as firmware / board allows
-arm_boost=1
-
-[cm4]
-# Enable host mode on the 2711 built-in XHCI USB controller.
-# This line should be removed if the legacy DWC2 controller is required
-# (e.g. for USB device mode) or if USB support is not required.
-otg_mode=1
-
-[all]
-dtparam=i2c1=on
-dtparam=i2c_arm=on
-dtparam=spi=on
-gpu_mem=1
-dtoverlay=dwc2
-#dtoverlay=disable-wifi
-
-[pi0]
-dtoverlay=spi0-0cs
-#dtoverlay=disable-wifi
-
-[pi3]
-dtoverlay=spi0-0cs
-#dtoverlay=disable-wifi
-
-[pi4]
-dtoverlay=spi0-0cs
-#dtoverlay=disable-wifi
-
-[pi5]
-dtoverlay=spi0-0cs
-#dtoverlay=disable-wifi

builder/raspberrypi32.yml

@@ -123,6 +123,7 @@
           - libc-ares-dev
           - libc6-dev
           - libcpuinfo-dev
+          - libcurl4-openssl-dev
           - libdbus-1-dev
           - libdbus-glib-1-dev
           - libeigen3-dev
@@ -206,6 +207,30 @@
         state: present
       when: hostname.changed
 
+    - name: setup /boot/config.txt
+      blockinfile:
+        path: /boot/config.txt
+        insertafter: EOF
+        block: |
+          dtparam=i2c1=on
+          dtparam=i2c_arm=on
+          dtparam=spi=on
+          gpu_mem=1
+          dtoverlay=dwc2
+          #dtoverlay=disable-wifi
+
+          [pi0]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+
+          [pi3]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+
+          [pi4]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+
     - name: Create custom plugin directory
       file:
         path: '{{ pwnagotchi.custom_plugin_dir }}'
@@ -264,6 +289,24 @@
         dest: /usr/local/lib/libpcap.so.0.8
         state: link
 
+    # install latest hcxtools
+
+    - name: clone hcxtools
+      git:
+        repo: https://github.com/ZerBea/hcxtools.git
+        dest: /usr/local/src/hcxtools
+
+    - name: install hcxtools
+      shell: "make && make install"
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/hcxtools
+
+    - name: remove hcxtools directory
+      file:
+        state: absent
+        path: /usr/local/src/hcxtools
+
     ###############################################################
     # Install nexmon to fix wireless scanning (takes 2.5G of space)
     ###############################################################

builder/raspberrypi64.yml

@@ -211,6 +211,34 @@
         regexp: '(.*)$'
         line: '\1 modules-load=dwc2,g_ether'
 
+    - name: setup /boot/firmware/config.txt
+      blockinfile:
+        path: /boot/firmware/config.txt
+        insertafter: EOF
+        block: |
+          dtparam=i2c1=on
+          dtparam=i2c_arm=on
+          dtparam=spi=on
+          gpu_mem=1
+          dtoverlay=dwc2
+          #dtoverlay=disable-wifi
+          
+          [pi0]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+          
+          [pi3]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+          
+          [pi4]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+          
+          [pi5]
+          dtoverlay=spi0-0cs
+          #dtoverlay=disable-wifi
+
     - name: change hostname
       lineinfile:
         dest: /etc/hostname