2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fixed handling of known_networks

Browse source
This commit is contained in:
2Shirt 2019-06-04 16:52:17 -06:00
parent b554cfebe0
commit d51538aac3
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.bin/Scripts/add-known-networks
View file

@ -4,6 +4,7 @@
import os import os
import re import re
import sys
import uuid import uuid
KNOWN_NETWORKS = '/root/known_networks' KNOWN_NETWORKS = '/root/known_networks'
@ -34,13 +35,21 @@ method=auto
''' '''
def get_user_name(): def get_user_name():
"""Get real user name, returns str.""" """Get user name, returns str."""
user = None user = None
# Get running user
if 'SUDO_USER' in os.environ: if 'SUDO_USER' in os.environ:
user = os.environ.get('SUDO_USER') user = os.environ.get('SUDO_USER')
else: else:
user = os.environ.get('USER') 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 return user
if __name__ == '__main__': if __name__ == '__main__':

4
Build Linux
View file

@ -283,8 +283,8 @@ function update_live_env() {
fi fi
# WiFi # WiFi
cp "$ROOT_DIR/.linux_items/known_networks" "/root/known_networks" cp "$ROOT_DIR/.linux_items/known_networks" "$LIVE_DIR/airootfs/root/known_networks"
echo "add-known-networks" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" echo "add-known-networks --user=$username" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
} }
function update_repo() { function update_repo() {