PR #271: (breaking changes) This fixes #124 and some more

(breaking changes) This fixes #124 and some more

1 files changed, 32 insertions, 25 deletions

diff --git a/examples/minimal.py b/examples/minimal.py
index 367574b5..98d9a6f0 100644
--- a/examples/minimal.py
+++ b/examples/minimal.py
@@ -1,4 +1,4 @@
-import archinstall, getpass
+import archinstall
 
 # Select a harddrive and a disk password
 archinstall.log(f"Minimal only supports:")
@@ -10,14 +10,14 @@ if archinstall.arguments.get('help', None):
 	archinstall.log(f" - Optional systemd network via --network")
 
 archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks())
-archinstall.arguments['harddrive'].keep_partitions = False
 
-def install_on(root, boot):
-	# We kick off the installer by telling it where the root and boot lives
-	with archinstall.Installer(root, boot_partition=boot, hostname='minimal-arch') as installation:
+def install_on(mountpoint):
+	# We kick off the installer by telling it where the 
+	with archinstall.Installer(mountpoint) as installation:
 		# Strap in the base system, add a boot loader and configure
 		# some other minor details as specified by this profile and user.
 		if installation.minimal_installation():
+			installation.set_hostname('minimal-arch')
 			installation.add_bootloader()
 
 			# Optionally enable networking:
@@ -36,29 +36,36 @@ def install_on(root, boot):
 	archinstall.log(f" * root (password: airoot)")
 	archinstall.log(f" * devel (password: devel)")
 
-print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
-archinstall.do_countdown()
+if archinstall.arguments['harddrive']:
+	archinstall.arguments['harddrive'].keep_partitions = False
+	
+	print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
+	archinstall.do_countdown()
 
-# First, we configure the basic filesystem layout
-with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
-	# We use the entire disk instead of setting up partitions on your own
-	if archinstall.arguments['harddrive'].keep_partitions is False:
-		fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
+	# First, we configure the basic filesystem layout
+	with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
+		# We use the entire disk instead of setting up partitions on your own
+		if archinstall.arguments['harddrive'].keep_partitions is False:
+			fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
 
-	boot = fs.find_partition('/boot')
-	root = fs.find_partition('/')
+		boot = fs.find_partition('/boot')
+		root = fs.find_partition('/')
 
-	boot.format('vfat')
+		boot.format('vfat')
 
-	# We encrypt the root partition if we got a password to do so with,
-	# Otherwise we just skip straight to formatting and installation
-	if archinstall.arguments.get('!encryption-password', None):
-		root.encrypt()
+		# We encrypt the root partition if we got a password to do so with,
+		# Otherwise we just skip straight to formatting and installation
+		if archinstall.arguments.get('!encryption-password', None):
+			root.encrypted = True
+			root.encrypt(password=archinstall.arguments.get('!encryption-password', None))
 
-		with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root:
-			unlocked_root.format(root.filesystem)
+			with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root:
+				unlocked_root.format(root.filesystem)
+				unlocked_root.mount('/mnt')
+		else:
+			root.format(root.filesystem)
+			root.mount('/mnt')
 
-			install_on(unlocked_root)
-	else:
-		root.format(root.filesystem)
-		install_on(root, boot)
\ No newline at end of file
+		boot.mount('/mnt/boot')
+
+install_on('/mnt')
\ No newline at end of file