diff --git a/lib/modules/partition/disks.nix b/lib/modules/partition/disks.nix index 2d616f0a..c7808086 100644 --- a/lib/modules/partition/disks.nix +++ b/lib/modules/partition/disks.nix @@ -355,10 +355,18 @@ (_: "sudo swapon ${partPath _}") (builtins.filter (_: _.useSwap) partitions)); in lib.strings.concatLines ( - (builtins.map (_: _.deviceScript) disks) ++ lib.optional ((builtins.length disks) > 0) ( - ''echo "Continuing this script will wipe the contents of '' + ( + (builtins.map (_: _.deviceScript) disks) ++ lib.optionals ((builtins.length disks) > 0) [ + ". ${./../../../scripts/Common/Scripts/is-truthy.sh}" + (''echo "Continuing this script will wipe the contents of '' + ( lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks)) - ) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'') ++ + ) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'') + ''read -p "Are you sure you want to continue? [y/n] " answer'' + '' + if ! isTruthy "$answer"; then + exit 1 + fi + '' + ] ++ (builtins.map (_: _.script) disks) ++ [ mountScript swapScript