tmp

yurasmetanka · Oct 21, 2024 · 4b65c19 · 4b65c19
1 parent f851905
commit 4b65c19
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/builder/bpim4.json.pkr.hcl b/builder/bpim4.json.pkr.hcl
@@ -50,7 +50,7 @@ build {
     destination = "/usr/bin/"
     sources     = [
       "data/64bit/usr/bin/bettercap-launcher",
-      "data/64bit/usr/bin/decryption-webserver",
+      // "data/64bit/usr/bin/decryption-webserver",
       "data/64bit/usr/bin/fix_pwny_ethernet.sh",
       "data/64bit/usr/bin/hdmioff",
       "data/64bit/usr/bin/hdmion",
@@ -74,8 +74,8 @@ build {
     destination = "/etc/"
     sources     = [
       "data/64bit/etc/rc.local",
-      "data/64bit/etc/dphys-swapfile",
-      "data/64bit/etc/bash_completion.d/",
+      // "data/64bit/etc/dphys-swapfile",
+      // "data/64bit/etc/bash_completion.d/",
       "data/64bit/etc/network/",
     ]
   }

diff --git a/builder/bpim4.yml b/builder/bpim4.yml
@@ -25,7 +25,8 @@
         - apt-daily-upgrade.timer
         - apt-daily.service
         - apt-daily.timer
-        # - bluetooth.service ## todo: disabled anyway, maybe reenable after bluetooth support for bpim4z is fixed in armbian kernel
+        - bluetooth.service
+        - wpa_supplicant.service
     packages:
       caplets:
         source: "https://github.com/jayofelony/caplets.git"
@@ -39,20 +40,20 @@
         url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/pwngrid-1.10.5-aarch64.zip"
       apt:
         downgrade:
-          - libpcap-dev_1.9.1-4_arm64.deb
-          - libpcap0.8-dbg_1.9.1-4_arm64.deb
-          - libpcap0.8-dev_1.9.1-4_arm64.deb
-          - libpcap0.8_1.9.1-4_arm64.deb
+          # - libpcap-dev_1.9.1-4_arm64.deb
+          # - libpcap0.8-dbg_1.9.1-4_arm64.deb
+          # - libpcap0.8-dev_1.9.1-4_arm64.deb
+          # - libpcap0.8_1.9.1-4_arm64.deb
         hold:
           - firmware-atheros
           - firmware-brcm80211
           - firmware-libertas
           - firmware-misc-nonfree
           - firmware-realtek
-          - libpcap-dev
-          - libpcap0.8
-          - libpcap0.8-dbg
-          - libpcap0.8-dev
+          # - libpcap-dev
+          # - libpcap0.8
+          # - libpcap0.8-dbg
+          # - libpcap0.8-dev
         remove:
           - nfs-common
           - triggerhappy
@@ -78,6 +79,7 @@
           - gawk
           - gcc-arm-none-eabi
           - git
+          - ifupdown
           - libatlas-base-dev
           - libblas-dev
           - libbz2-dev
@@ -114,6 +116,7 @@
           - libts-bin
           - libusb-1.0-0-dev
           - lsof
+          - net-tools
           - make
           - ntp
           - pkg-config
@@ -134,13 +137,13 @@
           - xxd
           - zlib1g-dev
           # some other stuff below which i'm not quite sure we need
-          # - libavcodec58
-          # - libavformat58
-          # - libswscale5
-          # - libtiff5
-          # - spi-tools
+          - libavcodec58
+          - libavformat58
+          - libswscale5
+          - libtiff5
+          - spi-tools
           # - python3-dev
-          # - python3-dbus
+          - python3-dbus
       pip:
         # todo: consider uing https://github.com/Dangku/RPi.GPIO instead
         # - "git+https://github.com/Sniffleupagus/OPi.GPIO@BPIm4zero#egg=OPi.GPIO"
@@ -167,6 +170,11 @@
         regexp: '^overlays='
         line: 'overlays=ph-i2c1 pg-i2c4 pg-uart1 spi0-spidev spi1-cs1-spidev'
 
+    - name: remove current rc.local
+      file:
+        path: /etc/rc.local
+        state: absent
+
     - name: adjust /etc/modules
       lineinfile:
         dest: /etc/modules
@@ -186,19 +194,19 @@
     - name: change hostname
       lineinfile:
         dest: /etc/hostname
-        regexp: '^raspberrypi'
+        regexp: '^bananapim4zero'
         line: "{{pwnagotchi.hostname}}"
         state: present
-      when: lookup('file', '/etc/hostname') == "raspberrypi"
-      register: hostname
+      when: lookup('file', '/etc/hostname') == "bananapim4zero"
+      # register: hostname
 
     - name: add hostname to /etc/hosts
       lineinfile:
         dest: /etc/hosts
-        regexp: '^127\.0\.1\.1[ \t]+raspberrypi'
+        regexp: '^127\.0\.1\.1[ \t]+bananapim4zero'
         line: "127.0.1.1\t{{pwnagotchi.hostname}}"
         state: present
-      when: hostname.changed
+      # when: hostname.changed
 
     - name: install packages
       apt:
@@ -593,6 +601,7 @@
         path: /home/pi
         owner: pi
         group: pi
+        mode: "u=rwX,go=rX"
         recurse: true
 
     - name: remove pre-collected packages zip

diff --git a/builder/data/64bit/etc/modules-load.d/modules.conf b/builder/data/64bit/etc/modules-load.d/modules.conf
@@ -3,4 +3,5 @@
 # This file contains the names of kernel modules that should be loaded
 # at boot time, one per line. Lines beginning with "#" are ignored.
 # Parameters can be specified after the module name.
-i2c-dev
+i2c-dev
+g_ether
diff --git a/builder/data/64bit/etc/rc.local b/builder/data/64bit/etc/rc.local
@@ -35,6 +35,6 @@ mv /etc/rc.local.ORIG /etc/rc.local || cat >/etc/rc.local <<EOF
 exit 0
 EOF
 
-exec /etc/rc.local
+# exec /etc/rc.local
 
 exit 0
-Original file line number
+Diff line change
@@ Expand Up @@
     exit 0
     EOF
-    exec /etc/rc.local
+    # exec /etc/rc.local
     exit 0