fixup! python: setup: arch: Switch to systemd-boot if necessary

Signed-off-by: Nathan Chancellor <[email protected]>

python/setup/arch.py

@@ -504,15 +504,15 @@ def switch_to_systemd_boot(dryrun=False):
 
     # Install systemd-boot to ESP
     if dryrun:
-        print('$ bootctl install')
+        print('$ bootctl install\n')
     else:
         subprocess.run(['bootctl', 'install'], check=True)
 
     # Create initial loader.conf
     loader_conf_txt = 'default linux.conf\ntimeout 3\n'
     if dryrun:
-        print('$ mkdir /boot/loader')
-        print(f"$ echo '{loader_conf_txt}' > /boot/loader/loader.conf")
+        print('$ mkdir /boot/loader\n')
+        print(f"$ echo '{loader_conf_txt}' > /boot/loader/loader.conf\n")
     else:
         Path('/boot/loader').mkdir(exist_ok=True)
         Path('/boot/loader/loader.conf').write_text(loader_conf_txt, encoding='utf-8')
@@ -549,13 +549,13 @@ def switch_to_systemd_boot(dryrun=False):
     linux_conf_txt = (
         'title Arch Linux (linux)\n'
         'linux /vmlinuz-linux\n'
-        f"initrd /{UCODE_VENDOR}-ucode.img\n" if UCODE_VENDOR else '',
+        f"initrd /{UCODE_VENDOR}-ucode.img\n" if UCODE_VENDOR else ''
         'initrd /initramfs-linux.img\n'
-        f"options {' '.join(sorted(cmdline_options))}\n",
+        f"options {cmdline_options}\n"
     )
     if dryrun:
-        print('$ mkdir /boot/loader/entries')
-        print(f"$ echo '{linux_conf_txt}' > /boot/loader/entries/linux.conf")
+        print('$ mkdir /boot/loader/entries\n')
+        print(f"$ echo '{linux_conf_txt}' > /boot/loader/entries/linux.conf\n")
     else:
         Path('/boot/loader/entries').mkdir(exist_ok=True)
         Path('/boot/loader/entries/linux.conf').write_text(linux_conf_txt, encoding='utf-8')