diff options
| author | Svein Ove Aas <svein.ove@aas.no> | 2015-12-12 20:32:38 +0000 |
|---|---|---|
| committer | Svein Ove Aas <svein.ove@aas.no> | 2015-12-12 20:32:38 +0000 |
| commit | 7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e (patch) | |
| tree | 964b46a3173fc1ddaace60f1e348d4c79af345fa /nixos/modules/tasks/filesystems | |
| parent | 6a4b71afa55616894cee6d9cc8b448fd22d2463b (diff) | |
| download | nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar.gz nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar.bz2 nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar.lz nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar.xz nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.tar.zst nixlib-7e86e9a048d2b5ee2eb054b52154cd2d48e0e43e.zip | |
zfs:Always import from /dev/disk/by-id
Diffstat (limited to 'nixos/modules/tasks/filesystems')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 675bd3d232a6..dedd3f5ca451 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -214,7 +214,7 @@ in done ''] ++ (map (pool: '' echo "importing root ZFS pool \"${pool}\"..." - zpool import -N $ZFS_FORCE "${pool}" + zpool import -d /dev/disk/by-id -N $ZFS_FORCE "${pool}" '') rootPools)); }; @@ -255,7 +255,7 @@ in }; script = '' zpool_cmd="${zfsUserPkg}/sbin/zpool" - ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d /dev/disk/by-id -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" ''; }; in listToAttrs (map createImportService dataPools) // { |