Updated functions/network.py

This commit is contained in:
2Shirt 2018-09-04 22:35:39 -06:00
parent a35be68780
commit 5ef7c9b16e
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -3,6 +3,7 @@
## Wizard Kit: Functions - Network ## Wizard Kit: Functions - Network
import os import os
import shutil
import sys import sys
# Init # Init
@ -26,13 +27,8 @@ def connect_to_network():
if is_connected(): if is_connected():
return return
# LAN
if 'en' in net_ifs:
# Reload the tg3/broadcom driver (known fix for some Dell systems)
try_and_print(message='Reloading drivers...', function=reload_tg3)
# WiFi # WiFi
if not is_connected() and 'wl' in net_ifs: if 'wl' in net_ifs:
cmd = [ cmd = [
'nmcli', 'dev', 'wifi', 'nmcli', 'dev', 'wifi',
'connect', WIFI_SSID, 'connect', WIFI_SSID,
@ -42,6 +38,18 @@ def connect_to_network():
function = run_program, function = run_program,
cmd = cmd) cmd = cmd)
# LAN
if not is_connected():
# Reload the tg3/broadcom driver (known fix for some Dell systems)
try_and_print(message='Reloading drivers...', function=reload_tg3)
# Rebuild conkyrc
shutil.copyfile(
'/etc/skel/.conkyrc',
'{HOME}/.conkyrc'.format(**global_vars['Env']))
cmd = ['{HOME}/.update_conky'.format(**global_vars['Env'])]
run_program(cmd, check=False)
def is_connected(): def is_connected():
"""Check for a valid private IP.""" """Check for a valid private IP."""
devs = psutil.net_if_addrs() devs = psutil.net_if_addrs()