public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11890 from Baughn/zfs

Browse Source 
zfs:Add option for zpool import -d, and set it to /dev/disk/by-id.
This commit is contained in:
William A. Kennington III 2016-01-05 14:37:19 -08:00
commit ce8c8f1e1b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -73,6 +73,21 @@ in
''; '';
}; };
devNodes = mkOption {
type = types.path;
default = "/dev/disk/by-id";
example = "/dev/disk/by-id";
description = ''
Name of directory from which to import ZFS devices.
Usually /dev works. However, ZFS import may fail if a device node is renamed.
It should therefore use stable device names, such as from /dev/disk/by-id.
The default remains /dev for 15.09, due to backwards compatibility concerns.
It will change to /dev/disk/by-id in the next NixOS release.
'';
};
forceImportRoot = mkOption { forceImportRoot = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -214,7 +229,7 @@ in
done done
''] ++ (map (pool: '' ''] ++ (map (pool: ''
echo "importing root ZFS pool \"${pool}\"..." echo "importing root ZFS pool \"${pool}\"..."
zpool import -d /dev/disk/by-id -N $ZFS_FORCE "${pool}" zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE "${pool}"
'') rootPools)); '') rootPools));
}; };
@ -255,7 +270,7 @@ in
}; };
script = '' script = ''
zpool_cmd="${zfsUserPkg}/sbin/zpool" zpool_cmd="${zfsUserPkg}/sbin/zpool"
("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d /dev/disk/by-id -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
''; '';
}; };
in listToAttrs (map createImportService dataPools) // { in listToAttrs (map createImportService dataPools) // {