chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't reset network interfaces configuration if not needed (closes #483)

Browse Source
This commit is contained in:
Simone Margaritelli
2019-11-01 12:12:37 +01:00
parent e06f2a32e8
commit ae330dc0b5
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
setup.py
View File

@ -5,16 +5,17 @@ import os
import glob import glob
import shutil import shutil
setup_path = os.path.dirname(__file__)
data_path = os.path.join(setup_path, "builder/data")
for source_filename in glob.glob("%s/**" % data_path, recursive=True): def install_file(source_filename, dest_filename):
if os.path.isfile(source_filename): # do not overwrite network configuration if it exists already
dest_filename = source_filename.replace(data_path, '') # https://github.com/evilsocket/pwnagotchi/issues/483
dest_folder = os.path.dirname(dest_filename) if dest_filename.startswith('/etc/network/interfaces.d/') and os.path.exists(dest_filename):
print("%s exists, skipping ..." % dest_filename)
return
print("installing %s to %s ..." % (source_filename, dest_filename)) print("installing %s to %s ..." % (source_filename, dest_filename))
try: try:
dest_folder = os.path.dirname(dest_filename)
if not os.path.isdir(dest_folder): if not os.path.isdir(dest_folder):
os.makedirs(dest_folder) os.makedirs(dest_folder)
@ -22,8 +23,21 @@ for source_filename in glob.glob("%s/**" % data_path, recursive=True):
except Exception as e: except Exception as e:
print("error installing %s: %s" % (source_filename, e)) print("error installing %s: %s" % (source_filename, e))
# reload systemd units
os.system("systemctl daemon-reload") def install_system_files():
setup_path = os.path.dirname(__file__)
data_path = os.path.join(setup_path, "builder/data")
for source_filename in glob.glob("%s/**" % data_path, recursive=True):
if os.path.isfile(source_filename):
dest_filename = source_filename.replace(data_path, '')
install_file(source_filename, dest_filename)
# reload systemd units
os.system("systemctl daemon-reload")
install_system_files()
required = [] required = []
with open('requirements.txt') as fp: with open('requirements.txt') as fp: