This should address and resolve #587 (#1070)

* This should address and resolve #587

* Forgot one line from copying from local test script

Co-authored-by: Anton Hvornum <anton.feeds@gmail.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index f10b4064..9959b0a8 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1028,7 +1028,12 @@ class Installer:
 			# This means the root account isn't locked/disabled with * in /etc/passwd
 			self.helper_flags['user'] = True
 
-		return SysCommand(f"/usr/bin/arch-chroot {self.target} sh -c \"echo '{user}:{password}' | chpasswd\"").exit_code == 0
+		combo = f'{user}:{password}'
+		echo = shlex.join(['echo', combo])
+		sh = shlex.join(['sh', '-c', echo])
+		
+		result = SysCommand(f"/usr/bin/arch-chroot {self.target} " + sh[:-1] + " | chpasswd'")
+		return result.exit_code == 0
 
 	def user_set_shell(self, user :str, shell :str) -> bool:
 		self.log(f'Setting shell for {user} to {shell}', level=logging.INFO)