Skip to content

Commit c2c10ab

Browse files
committed
Revert "nixos-remote: add --skip-disko flag"
because disko is needed to mount the disks, and disko does not have an "mount only" flag. This reverts commit 68738e0.
1 parent 0633858 commit c2c10ab

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/nixos-remote.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Options:
1515
do not reboot after installation, allowing further customization of the target installation.
1616
* --kexec url
1717
use another kexec tarball to bootstrap NixOS
18-
* --skip-disko
19-
dont format disks with disko
2018
* --stop-after-disko
2119
exit after disko formating, you can then proceed to install manually or some other way
2220
* --extra-files files
@@ -91,9 +89,6 @@ while [[ $# -gt 0 ]]; do
9189
shift
9290
shift
9391
;;
94-
--skip-disko)
95-
skip_disko=y
96-
;;
9792
--stop-after-disko)
9893
stop_after_disko=y
9994
;;
@@ -298,12 +293,8 @@ for path in "${!disk_encryption_keys[@]}"; do
298293
ssh_ "umask 077; cat > $path" <"${disk_encryption_keys[$path]}"
299294
done
300295

301-
if [[ ${skip_disko} == "y" ]]; then
302-
echo "Skipping disko (partitioning)."
303-
else
304-
nix_copy --to "ssh://$ssh_connection" "$disko_script"
305-
ssh_ "$disko_script"
306-
fi
296+
nix_copy --to "ssh://$ssh_connection" "$disko_script"
297+
ssh_ "$disko_script"
307298

308299
if [[ ${stop_after_disko-n} == "y" ]]; then
309300
# Should we also do this for `--no-reboot`?

0 commit comments

Comments
 (0)