Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md11
-rw-r--r--archinstall.py7
2 files changed, 10 insertions, 8 deletions
diff --git a/README.md b/README.md
index cad62ec8..2bc39866 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# archinstall
-Just a bare bone automated [Arch](https://wiki.archlinux.org/index.php/Arch_Linux) install with network deployment instructions based on MAC-address.
+Just a bare bone automated [Arch](https://wiki.archlinux.org/index.php/Arch_Linux) install with optional network deployment instructions based on MAC-address.
Pre-built ISO's can be found here: https://hvornum.se/archiso/
@@ -7,13 +7,12 @@ Pre-built ISO's can be found here: https://hvornum.se/archiso/
In a live-cd environment, do:
# wget https://raw.githubusercontent.com/Torxed/archinstall/master/archinstall.py
- # python3 archinstall.py --default
+ # pacman -S --noconfirm python; python archinstall.py --default
-> **CAUTION**: If no **other** parameters are given, **it will devour the first disk in your system** (Usually `/dev/sda`, `/dev/nvme0n1` etc).
+This will install a basic Arch Linux, without interaction, on the first drive it finds *(after user confirms it)*.<br>
+Use `--drive=/dev/sdb` etc to change the desired destination, or skip `--default` if you want to get options for your installation.
-This will install a basic Arch Linux, without interaction, on the first drive it finds. Use `--drive=/dev/sdb` etc to change the desired destination, or skip `--default` if you want to get options for your installation.
-
-> NOTE: This assumes Python is installed on your ISO, follow [ArchISO](https://wiki.archlinux.org/index.php/archiso)'s guide on how to create your own ISO or use a pre-built [guided ISO](https://hvornum.se/archiso/). Below is examples and a cheat sheet on how to create such a ISO *(with different flavors)*.
+> NOTE: Follow [ArchISO](https://wiki.archlinux.org/index.php/archiso)'s guide on how to create your own ISO or use a pre-built [guided ISO](https://hvornum.se/archiso/) to skip the python installation step, or to create auto-installing ISO templates. Below is examples and a cheat sheet on how to create such a ISO *(with different flavors)*.
# Features
diff --git a/archinstall.py b/archinstall.py
index 3ea629db..1420c7b6 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -482,8 +482,8 @@ if __name__ == '__main__':
if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now
if not 'drive' in args:
drives = list(harddrives.keys())
- if len(drives) > 1 and not ('force' in args or 'first-drive' in args):
- raise KeyError("Multiple disks found, and --force / --first-drive wasn't specified.")
+ if len(drives) > 1 and not ('force' in args or 'first-drive' in args or 'default' in args):
+ raise KeyError("Multiple disks found, --drive=/dev/X not specified (or --force/--first-drive)")
args['drive'] = sorted(drives)[0] # First drive found
rerun = args['ignore-rerun']
@@ -585,6 +585,9 @@ if __name__ == '__main__':
# if not args['password']:
print(json.dumps(args, indent=4))
+ if args['default'] and not 'force' in args:
+ if(input('Are these settings OK? (No return beyond this point) N/y: ').lower() != 'y'):
+ die(1)
if not os.path.isfile(args['pwfile']):
#PIN = '0000'