From d51538aac3ebafe68f7d47386af42393e308237e Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 4 Jun 2019 16:52:17 -0600 Subject: [PATCH] Fixed handling of known_networks --- .bin/Scripts/add-known-networks | 11 ++++++++++- Build Linux | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.bin/Scripts/add-known-networks b/.bin/Scripts/add-known-networks index 6047c438..76316055 100644 --- a/.bin/Scripts/add-known-networks +++ b/.bin/Scripts/add-known-networks @@ -4,6 +4,7 @@ import os import re +import sys import uuid KNOWN_NETWORKS = '/root/known_networks' @@ -34,13 +35,21 @@ method=auto ''' def get_user_name(): - """Get real user name, returns str.""" + """Get user name, returns str.""" user = None + + # Get running user if 'SUDO_USER' in os.environ: user = os.environ.get('SUDO_USER') else: user = os.environ.get('USER') + # Check if user manually specified + for a in sys.argv: + a = a.strip().lower() + if a.startswith('--user='): + user = a.replace('--user=', '') + return user if __name__ == '__main__': diff --git a/Build Linux b/Build Linux index 980c2e77..f9acd897 100755 --- a/Build Linux +++ b/Build Linux @@ -283,8 +283,8 @@ function update_live_env() { fi # WiFi - cp "$ROOT_DIR/.linux_items/known_networks" "/root/known_networks" - echo "add-known-networks" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" + cp "$ROOT_DIR/.linux_items/known_networks" "$LIVE_DIR/airootfs/root/known_networks" + echo "add-known-networks --user=$username" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" } function update_repo() {