diff options
| -rw-r--r-- | default.nix | 6 | ||||
| -rwxr-xr-x | disk-deactivate/disk-deactivate | 6 | ||||
| -rw-r--r-- | disk-deactivate/disk-deactivate.jq | 77 | ||||
| -rw-r--r-- | example/complex.nix | 6 | ||||
| -rw-r--r-- | example/swap.nix | 4 | ||||
| -rw-r--r-- | example/zfs-over-legacy.nix | 2 | ||||
| -rw-r--r-- | module.nix | 6 | ||||
| -rw-r--r-- | tests/default.nix | 2 | ||||
| -rw-r--r-- | tests/lib.nix | 11 | ||||
| -rw-r--r-- | tests/swap.nix | 3 | ||||
| -rw-r--r-- | types.nix | 23 |
11 files changed, 114 insertions, 32 deletions
diff --git a/default.nix b/default.nix index bc975a7..ada33e4 100644 --- a/default.nix +++ b/default.nix @@ -17,7 +17,7 @@ in { create = cfg: types.diskoLib.create (eval cfg).config.devices; createScript = cfg: pkgs: pkgs.writeScript "disko-create" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.create (eval cfg).config.devices} ''; createScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-create" '' @@ -27,7 +27,7 @@ in { mount = cfg: types.diskoLib.mount (eval cfg).config.devices; mountScript = cfg: pkgs: pkgs.writeScript "disko-mount" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.mount (eval cfg).config.devices} ''; mountScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-mount" '' @@ -37,7 +37,7 @@ in { zapCreateMount = cfg: types.diskoLib.zapCreateMount (eval cfg).config.devices; zapCreateMountScript = cfg: pkgs: pkgs.writeScript "disko-zap-create-mount" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.zapCreateMount (eval cfg).config.devices} ''; zapCreateMountScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-zap-create-mount" '' diff --git a/disk-deactivate/disk-deactivate b/disk-deactivate/disk-deactivate new file mode 100755 index 0000000..7dcd753 --- /dev/null +++ b/disk-deactivate/disk-deactivate @@ -0,0 +1,6 @@ +#!/bin/sh +set -efux +# dependencies: jq util-linux lvm2 mdadm zfs +disk=$1 + +lsblk --output-all --json | jq -r --arg disk_to_clear "$disk" -f "$(dirname $0)/disk-deactivate.jq" diff --git a/disk-deactivate/disk-deactivate.jq b/disk-deactivate/disk-deactivate.jq new file mode 100644 index 0000000..54d98f7 --- /dev/null +++ b/disk-deactivate/disk-deactivate.jq @@ -0,0 +1,77 @@ +# since lsblk lacks zfs support, we have to do it this way +def remove: + if .fstype == "zfs_member" then + "zpool destroy -f \(.label)" + elif .fstype == "LVM2_member" then + [ + "vg=$(pvs \(.path) --noheadings --options vg_name | grep -o '[a-zA-Z0-9-]*')", + "vgchange -a n \"$vg\"", + "vgremove -f \"$vg\"" + ] + elif .fstype == "swap" then + "swapoff \(.path)" + elif .fstype == null then + # maybe its zfs + [ + # the next line has some horrible escaping + "zpool=$(zdb -l \(.path) | sed -nr $'s/ +name: \\'(.*)\\'/\\\\1/p')", + "if [[ -n \"${zpool}\" ]]; then zpool destroy -f \"$zpool\"; fi", + "unset zpool" + ] + else + [] + end +; + +def deactivate: + if .type == "disk" then + [ + "wipefs --all -f \(.path)" + ] + elif .type == "part" then + [ + "wipefs --all -f \(.path)" + ] + elif .type == "crypt" then + [ + "cryptsetup luksClose \(.path)", + "wipefs --all -f \(.path)" + ] + elif .type == "lvm" then + (.name | split("-")[0]) as $vgname | + (.name | split("-")[1]) as $lvname | + [ + "lvremove -fy \($vgname)/\($lvname)" + ] + elif .type == "raid1" then + [ + "mdadm --stop \(.name)" + ] + else + [] + end +; + +def walk: + [ + (.mountpoints[] | "umount -R \(.)"), + ((.children // []) | map(walk)), + remove, + deactivate + ] +; + +def init: + "/dev/\(.name)" as $disk | + if $disk == $disk_to_clear then + [ + "set -fu", + walk + ] + else + [] + end +; + +.blockdevices | map(init) | flatten | join("\n") + diff --git a/example/complex.nix b/example/complex.nix index b361196..939f71e 100644 --- a/example/complex.nix +++ b/example/complex.nix @@ -39,6 +39,9 @@ type = "luks"; name = "crypted1"; keyFile = "/tmp/secret.key"; + extraArgs = [ + "--iter-time 1" + ]; content = { type = "lvm_pv"; vg = "pool"; @@ -64,6 +67,9 @@ type = "luks"; name = "crypted2"; keyFile = "/tmp/secret.key"; + extraArgs = [ + "--iter-time 1" + ]; content = { type = "lvm_pv"; vg = "pool"; diff --git a/example/swap.nix b/example/swap.nix index 0693caa..13393fe 100644 --- a/example/swap.nix +++ b/example/swap.nix @@ -25,7 +25,6 @@ start = "100MiB"; end = "-1G"; part-type = "primary"; - bootable = true; content = { type = "filesystem"; format = "ext4"; @@ -33,12 +32,11 @@ }; } { - name = "root"; + name = "swap"; type = "partition"; start = "-1G"; end = "100%"; part-type = "primary"; - bootable = true; content = { type = "swap"; randomEncryption = true; diff --git a/example/zfs-over-legacy.nix b/example/zfs-over-legacy.nix index 8e02b00..1a6bbd3 100644 --- a/example/zfs-over-legacy.nix +++ b/example/zfs-over-legacy.nix @@ -49,7 +49,6 @@ zpool = { zroot = { type = "zpool"; - rootFsOptions.mountpoint = "none"; datasets = { "root" = { zfs_type = "filesystem"; @@ -58,7 +57,6 @@ "root/zfs_fs" = { zfs_type = "filesystem"; mountpoint = "/zfs_fs"; - options.mountpoint = "/zfs_fs"; options."com.sun:auto-snapshot" = "true"; }; }; @@ -19,17 +19,17 @@ in { }; config = { system.build.formatScript = pkgs.writers.writeDash "disko-create" '' - export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}:$PATH ${types.diskoLib.create cfg.devices} ''; system.build.mountScript = pkgs.writers.writeDash "disko-mount" '' - export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}:$PATH ${types.diskoLib.mount cfg.devices} ''; system.build.disko = pkgs.writers.writeBash "disko" '' - export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}:$PATH ${types.diskoLib.zapCreateMount cfg.devices} ''; diff --git a/tests/default.nix b/tests/default.nix index c10cf76..c7c15a5 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -20,7 +20,7 @@ let (lib.attrNames (builtins.readDir ./.)) ); - allTests = lib.genAttrs (allTestFilenames) (test: import (./. + "/${test}.nix") { inherit makeDiskoTest; }) // + allTests = lib.genAttrs (allTestFilenames) (test: import (./. + "/${test}.nix") { inherit makeDiskoTest pkgs; }) // evalTest "lvm-luks-example" ../example/config.nix // { standalone = (pkgs.nixos [ ../example/stand-alone/configuration.nix ]).config.system.build.toplevel; }; diff --git a/tests/lib.nix b/tests/lib.nix index 4b81da7..80ad0e3 100644 --- a/tests/lib.nix +++ b/tests/lib.nix @@ -26,6 +26,7 @@ tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create (import disko-config { disks = builtins.tail disks; inherit lib; })); tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount (import disko-config { disks = builtins.tail disks; inherit lib; })); tsp-config = (pkgs.callPackage ../. { }).config (import disko-config { inherit disks; inherit lib; }); + tsp-disko = pkgs.writeScript "disko" ((pkgs.callPackage ../. { }).zapCreateMount (import disko-config { disks = builtins.tail disks; inherit lib; })); num-disks = builtins.length (lib.attrNames (import disko-config { inherit lib; }).disk); installed-system = { modulesPath, ... }: { imports = [ @@ -60,9 +61,6 @@ efiSupport = efi; efiInstallAsRemovable = efi; }; - environment.systemPackages = [ - pkgs.jq - ]; }; installedTopLevel = (eval-config { modules = [ installed-system ]; @@ -93,6 +91,9 @@ (modulesPath + "/profiles/minimal.nix") extraConfig ]; + environment.systemPackages = [ + pkgs.jq + ]; # speed-up eval documentation.enable = false; @@ -127,20 +128,24 @@ machine.succeed("${tsp-create}") machine.succeed("${tsp-mount}") machine.succeed("${tsp-mount}") # verify that the command is idempotent + machine.succeed("${tsp-disko}") # verify that we can destroy and recreate ''} ${lib.optionalString (testMode == "module") '' machine.succeed("${nodes.machine.system.build.formatScript}") machine.succeed("${nodes.machine.system.build.mountScript}") machine.succeed("${nodes.machine.system.build.mountScript}") # verify that the command is idempotent + machine.succeed("${nodes.machine.system.build.disko}") # verify that we can destroy and recreate again ''} ${lib.optionalString (testMode == "cli") '' # TODO use the disko cli here # machine.succeed("${../.}/disko --no-pkgs --mode create ${disko-config}") # machine.succeed("${../.}/disko --no-pkgs --mode mount ${disko-config}") # machine.succeed("${../.}/disko --no-pkgs --mode mount ${disko-config}") # verify that the command is idempotent + # machine.succeed("${../.}/disko --no-pkgs --mode zap_create_mount ${disko-config}") # verify that we can destroy and recreate again machine.succeed("${tsp-create}") machine.succeed("${tsp-mount}") machine.succeed("${tsp-mount}") # verify that the command is idempotent + machine.succeed("${tsp-disko}") # verify that we can destroy and recreate ''} ${lib.optionalString testBoot '' diff --git a/tests/swap.nix b/tests/swap.nix index d3268dc..4861f8d 100644 --- a/tests/swap.nix +++ b/tests/swap.nix @@ -16,4 +16,7 @@ makeDiskoTest { ' """); ''; + extraConfig = { + environment.systemPackages = [ pkgs.jq ]; + }; } @@ -154,23 +154,11 @@ rec { */ zapCreateMount = devices: '' set -efux - shopt -s nullglob - # print existing disks - lsblk + umount -Rv /mnt || : - # TODO get zap the same way we get create - # make partitioning idempotent by dismounting already mounted filesystems - if findmnt /mnt; then - umount -Rlv /mnt - fi - - # stop all existing raids - if command -v mdadm; then - for r in /dev/md/* /dev/md[0-9]*; do - # might fail if the device was already closed in the loop - mdadm --stop "$r" || true - done - fi + for dev in ${toString (lib.catAttrs "device" (lib.attrValues devices.disk))}; do + ${./disk-deactivate}/disk-deactivate "$dev" | bash -x + done echo 'creating partitions...' ${diskoLib.create devices} @@ -912,6 +900,7 @@ rec { type = types.functionTo types.str; default = vg: '' lvcreate \ + --yes \ ${if hasInfix "%" config.size then "-l" else "-L"} ${config.size} \ -n ${config.name} \ ${optionalString (!isNull config.lvm_type) "--type=${config.lvm_type}"} \ @@ -1418,7 +1407,7 @@ rec { internal = true; readOnly = true; type = types.functionTo (types.listOf types.package); - default = pkgs: lib.optionals (!isNull config.content) (config.content._pkgs pkgs); + default = pkgs: [ pkgs.jq ] ++ lib.optionals (!isNull config.content) (config.content._pkgs pkgs); }; }; }); |