Merge #128

128: add support for another mountpoint than /mnt r=Mic92 a=Lassulus



Co-authored-by: lassulus <lassulus@lassul.us>
Co-authored-by: lassulus <git@lassul.us>

cli.nix

@@ -3,10 +3,12 @@
 , flake ? null
 , flakeAttr ? null
 , diskoFile ? null
+, rootMountPoint ? "/mnt"
 , noDeps ? false
 , ... }@args:
 let
   disko = import ./. {
+    inherit rootMountPoint;
     lib = pkgs.lib;
   };
 

default.nix

@@ -1,6 +1,8 @@
-{ lib ? import <nixpkgs/lib> }:
+{ lib ? import <nixpkgs/lib>
+, rootMountPoint ? "/mnt"
+}:
 let
-  types = import ./types.nix { inherit lib; };
+  types = import ./types.nix { inherit lib rootMountPoint; };
   eval = cfg: lib.evalModules {
     modules = lib.singleton {
       # _file = toString input;

disk-deactivate/disk-deactivate

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -efux
 # dependencies: jq util-linux lvm2 mdadm zfs
-disk=$1
+disk=$(realpath "$1")
 
 lsblk --output-all --json | jq -r --arg disk_to_clear "$disk" -f "$(dirname "$0")/disk-deactivate.jq"

disko

@@ -25,6 +25,8 @@ Options:
   pass value to nix-build. can be used to set disk-names for example
 * --argstr name value
   pass value to nix-build as string
+* --root-mountpoint /mnt
+  where to mount the device tree
 * --dry-run
   just show the path to the script instead of running it
 * --debug
@@ -54,7 +56,7 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     -f | --flake)
-      flake="$2"
+      flake=$2
       shift
       ;;
     --argstr | --arg)
@@ -69,6 +71,10 @@ while [[ $# -gt 0 ]]; do
     --dry-run)
       dry_run=y
       ;;
+    --root-mountpoint)
+      nix_args+=(--arg rootMountPoint "$2")
+      shift
+      ;;
     --no-deps)
       nix_args+=(--arg noDeps true)
       ;;

doc.nix

@@ -1,7 +1,10 @@
 { lib, nixosOptionsDoc, runCommand, fetchurl, pandoc }:
 
 let
-  types = import ./types.nix { inherit lib; };
+  types = import ./types.nix {
+    inherit lib;
+    rootMountPoint = "/mnt";
+  };
   eval = lib.evalModules {
     modules =  [
       {

module.nix

@@ -1,6 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  types = import ./types.nix { inherit lib; };
+  types = import ./types.nix {
+    inherit lib;
+    rootMountPoint = config.disko.rootMountPoint;
+  };
   cfg = config.disko;
 in {
   options.disko = {
@@ -9,6 +12,11 @@ in {
       default = {};
       description = "The devices to set up";
     };
+    rootMountPoint = lib.mkOption {
+      type = lib.types.str;
+      default = "/mnt";
+      description = "Where the device tree should be mounted by the mountScript";
+    };
     enableConfig = lib.mkOption {
       description = ''
         configure nixos with the specified devices

types.nix

@@ -1,4 +1,4 @@
-{ lib }:
+{ lib, rootMountPoint }:
 with lib;
 with builtins;
 
@@ -211,7 +211,7 @@ rec {
     in ''
       set -efux
       # first create the necessary devices
-      ${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) "" devices) {}).dev or "") sortedDeviceList}
+      ${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) {} devices) {}).dev or "") sortedDeviceList}
 
       # and then mount the filesystems in alphabetical order
       ${concatStrings (attrValues fsMounts)}
@@ -223,7 +223,7 @@ rec {
     */
     zapCreateMount = devices: ''
       set -efux
-      umount -Rv /mnt || :
+      umount -Rv "${rootMountPoint}" mnt || :
 
       for dev in ${toString (lib.catAttrs "device" (lib.attrValues devices.disk))}; do
         ${./disk-deactivate}/disk-deactivate "$dev" | bash -x
@@ -247,25 +247,22 @@ rec {
   };
 
   optionTypes = rec {
-    # POSIX.1‐2017, 3.281 Portable Filename
     filename = mkOptionType {
-      name = "POSIX portable filename";
+      name = "filename";
-      check = x: isString x && builtins.match "[0-9A-Za-z._][0-9A-Za-z._-]*" x != null;
+      check = x: isString x;
       merge = mergeOneOption;
       description = "A filename";
     };
 
-    # POSIX.1‐2017, 3.2 Absolute Pathname
     absolute-pathname = mkOptionType {
-      name = "POSIX absolute pathname";
+      name = "absolute pathname";
       check = x: isString x && substring 0 1 x == "/" && pathname.check x;
       merge = mergeOneOption;
       description = "An absolute path";
     };
 
-    # POSIX.1-2017, 3.271 Pathname
     pathname = mkOptionType {
-      name = "POSIX pathname";
+      name = "pathname";
       check = x:
         let
           # The filter is used to normalize paths, i.e. to remove duplicated and
@@ -354,8 +351,8 @@ rec {
         inherit config options;
         default = {}: {
           fs.${config.mountpoint} = ''
-            if ! findmnt ${config.fsType} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
+            if ! findmnt ${config.fsType} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
-              mount -t ${config.fsType} ${config.device} "/mnt${config.mountpoint}" \
+              mount -t ${config.fsType} ${config.device} "${rootMountPoint}${config.mountpoint}" \
               ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
               -o X-mount.mkdir
             fi
@@ -434,8 +431,8 @@ rec {
           in {
             fs = subvolMounts.fs // optionalAttrs (!isNull config.mountpoint) {
               ${config.mountpoint} = ''
-                if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
+                if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
-                  mount ${dev} "/mnt${config.mountpoint}" \
+                  mount ${dev} "${rootMountPoint}${config.mountpoint}" \
                   ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
                   -o X-mount.mkdir
                 fi
@@ -524,8 +521,8 @@ rec {
                        else null;
         in optionalAttrs (!isNull mountpoint) {
           fs.${mountpoint} = ''
-            if ! findmnt ${dev} "/mnt${mountpoint}" > /dev/null 2>&1; then
+            if ! findmnt ${dev} "${rootMountPoint}${mountpoint}" > /dev/null 2>&1; then
-              mount ${dev} "/mnt${mountpoint}" \
+              mount ${dev} "${rootMountPoint}${mountpoint}" \
               ${concatMapStringsSep " " (opt: "-o ${opt}") (config.mountOptions ++ [ "subvol=${config.name}" ])} \
               -o X-mount.mkdir
             fi
@@ -603,8 +600,8 @@ rec {
         inherit config options;
         default = {dev}: {
           fs.${config.mountpoint} = ''
-            if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
+            if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
-              mount ${dev} "/mnt${config.mountpoint}" \
+              mount ${dev} "${rootMountPoint}${config.mountpoint}" \
                 -t "${config.format}" \
                 ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
                 -o X-mount.mkdir
@@ -683,9 +680,7 @@ rec {
           let
             partMounts = diskoLib.deepMergeMap (partition: partition._mount {inherit dev;}) config.partitions;
           in {
-            dev = ''
+            dev = partMounts.dev or "";
-              ${concatMapStrings (x: x.dev or "") (attrValues partMounts)}
-            '';
             fs = partMounts.fs or {};
         };
       };
@@ -1169,8 +1164,8 @@ rec {
           '';
           fs = datasetMounts.fs // optionalAttrs (!isNull config.mountpoint) {
             ${config.mountpoint} = ''
-              if ! findmnt ${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
+              if ! findmnt ${config.name} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
-                mount ${config.name} "/mnt${config.mountpoint}" \
+                mount ${config.name} "${rootMountPoint}${config.mountpoint}" \
                 ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \
                 ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
                 -o X-mount.mkdir \
@@ -1273,8 +1268,8 @@ rec {
         default = {zpool}:
           optionalAttrs (config.zfs_type == "volume" && !isNull config.content) (config.content._mount {dev = "/dev/zvol/${zpool}/${config.name}";}) //
             optionalAttrs (config.zfs_type == "filesystem" && config.options.mountpoint or "" != "none") { fs.${config.mountpoint} = ''
-              if ! findmnt ${zpool}/${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
+              if ! findmnt ${zpool}/${config.name} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
-                mount ${zpool}/${config.name} "/mnt${config.mountpoint}" \
+                mount ${zpool}/${config.name} "${rootMountPoint}${config.mountpoint}" \
                 -o X-mount.mkdir \
                 ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
                 ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \