From 480d61c3f7f02db48db945646a2dc7e94ae754b4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 17 Jul 2023 19:02:02 +0200 Subject: [PATCH] lib: rename umount to destroy --- lib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 0220866..1377c8b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -372,7 +372,7 @@ let The scripts generated by disko ''; default = { pkgs, checked ? false }: { - umountScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-umount" '' + destroyScript = (diskoLib.writeCheckedBash { inherit pkgs checked binPrefix; }) "disko-destroy" '' export PATH=${lib.makeBinPath (with pkgs; [ util-linux e2fsprogs @@ -380,7 +380,7 @@ let zfs lvm2 ])}:$PATH - ${cfg.config._umount} + ${cfg.config._destroy} ''; formatScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-format" '' @@ -399,8 +399,8 @@ let ''; # These are useful to skip copying executables uploading a script to an in-memory installer - umountScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-umount" '' - ${cfg.config._umount} + destroyScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-destroy" '' + ${cfg.config._destroy} ''; formatScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-format" '' @@ -416,7 +416,7 @@ let ''; }; }; - _umount = lib.mkOption { + _destroy = lib.mkOption { internal = true; type = lib.types.str; description = '' @@ -475,7 +475,7 @@ let The script to umount, create and mount all devices defined by disko.devices ''; default = '' - ${cfg.config._umount} + ${cfg.config._destroy} ${cfg.config._create} ${cfg.config._mount} '';