From 51f7543b0498a84cfc10a7f5549da2e1594ae92e Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 13 May 2018 23:22:00 +0200 Subject: Fixed urllib in offline mode. Apparently, urrlib throws different errors on the "same" issue. With ambiguous names at that. --- archinstall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archinstall.py b/archinstall.py index 9fa0d07e..2d8ad2c4 100644 --- a/archinstall.py +++ b/archinstall.py @@ -253,7 +253,7 @@ if __name__ == '__main__': for mac in locmac: try: instructions = grab_url_data('https://raw.githubusercontent.com/Torxed/archinstall/net-deploy/deployments/{}.json'.format(mac)) - except urllib.error.HTTPError: + except (urllib.error.HTTPError, urllib.error.URLError) as e: print('[N] No instructions for this box on this mac: {}'.format(mac)) continue -- cgit v1.2.3-70-g09d2 From 4031af07597002747ae344dd3e8594520688f4e9 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 13 May 2018 23:23:43 +0200 Subject: Fixed git-clone when making the ArchIso Seeing as the customize_airootfs.sh *sometimes* runs from /root, but sometimes doesn't, we need to make sure we're in /root before doing the git clone. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c566a4e..ea7eb7b9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Just a bare bone automated [Arch](https://wiki.archlinux.org/index.php/Arch_Linu # cd ~/archlive # echo -e "git\npython-psutil" >> packages.both - # echo "git clone https://github.com/Torxed/archinstall.git" >> ./airootfs/root/customize_airootfs.sh + # echo "cd /root; git clone https://github.com/Torxed/archinstall.git" >> ./airootfs/root/customize_airootfs.sh # echo "chmod +x ~/archinstall/archinstall.py" >> ./airootfs/root/customize_airootfs.sh # mkdir ./airootfs/etc/skel # echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sh -c ~/archinstall/archinstall.py' >> ./airootfs/etc/skel/.zprofile -- cgit v1.2.3-70-g09d2