From e9fe5bb52a08fc98fdcf613625715a12d47eedf3 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Mon, 28 Aug 2023 10:05:16 +0200 Subject: [PATCH] Update Makefile Signed-off-by: Jeroen Oudshoorn --- Makefile | 2 +- builder/pwnagotchi.json | 91 ----------------------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) diff --git a/Makefile b/Makefile index 88cac16b..eaf682f0 100644 --- a/Makefile +++ b/Makefile @@ -59,4 +59,4 @@ clean: - rm -rf dist pwnagotchi.egg-info - rm -f $(PACKER) - rm -f $(PWN_RELEASE).* - - sudo rm -rf builder/output-pwnagotchi builder/packer_cache \ No newline at end of file + - sudo rm -rf builder/output-pwnagotchi builder/packer_cache diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json index 52728dd1..f045ed95 100644 --- a/builder/pwnagotchi.json +++ b/builder/pwnagotchi.json @@ -11,91 +11,6 @@ } ], "provisioners": [ - { - "type": "shell", - "inline": [ - "sed -i 's/^\\([^#]\\)/#\\1/g' /etc/ld.so.preload", - "dpkg-architecture", - "apt-get -y --allow-releaseinfo-change update", - "apt-get install -y ansible" - ] - }, - { - "type": "file", - "source": "data/usr/bin/pwnlib", - "destination": "/usr/bin/pwnlib" - }, - { - "type": "file", - "source": "data/usr/bin/bettercap-launcher", - "destination": "/usr/bin/bettercap-launcher" - }, - { - "type": "file", - "source": "data/usr/bin/pwnagotchi-launcher", - "destination": "/usr/bin/pwnagotchi-launcher" - }, - { - "type": "file", - "source": "data/usr/bin/monstop", - "destination": "/usr/bin/monstop" - }, - { - "type": "file", - "source": "data/usr/bin/monstart", - "destination": "/usr/bin/monstart" - }, - { - "type": "file", - "source": "data/usr/bin/hdmion", - "destination": "/usr/bin/hdmion" - }, - { - "type": "file", - "source": "data/usr/bin/hdmioff", - "destination": "/usr/bin/hdmioff" - }, - { - "type": "file", - "source": "data/etc/network/interfaces.d/lo-cfg", - "destination": "/etc/network/interfaces.d/lo-cfg" - }, - { - "type": "file", - "source": "data/etc/network/interfaces.d/wlan0-cfg", - "destination": "/etc/network/interfaces.d/wlan0-cfg" - }, - { - "type": "file", - "source": "data/etc/network/interfaces.d/usb0-cfg", - "destination": "/etc/network/interfaces.d/usb0-cfg" - }, - { - "type": "file", - "source": "data/etc/network/interfaces.d/eth0-cfg", - "destination": "/etc/network/interfaces.d/eth0-cfg" - }, - { - "type": "file", - "source": "data/etc/systemd/system/pwngrid-peer.service", - "destination": "/etc/systemd/system/pwngrid-peer.service" - }, - { - "type": "file", - "source": "data/etc/systemd/system/pwnagotchi.service", - "destination": "/etc/systemd/system/pwnagotchi.service" - }, - { - "type": "file", - "source": "data/etc/systemd/system/bettercap.service", - "destination": "/etc/systemd/system/bettercap.service" - }, - { - "type": "shell", - "inline": [ - "chmod +x /usr/bin/*" - ] - }, { "type": "file", "sources": [ @@ -108,12 +23,6 @@ "playbook_file": "pwnagotchi.yml", "extra_arguments": [ "--extra-vars \"ansible_python_interpreter=/usr/bin/python3\"" ], "command": "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION={{user `pwn_version`}} PWN_HOSTNAME={{user `pwn_hostname`}} ansible-playbook" - }, - { - "type": "shell", - "inline": [ - "mv /etc/ld.so.preload.DISABLED /etc/ld.so.preload" - ] } ] }