diff options
| author |   Richard Yao <ryao@cs.stonybrook.edu> | 2012-07-21 13:41:38 -0400 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2012-07-21 13:41:38 -0400 |
| commit | e05ab0d1a1e739e152ec6ef77a6335891f34fe2b (patch) | |
| tree | 8021d95ad6aee1277eac2d2ce4b1c3b81df00ac4 /defaults | |
| parent | USB 3.0 Support: Load xhci-hcd when available (diff) | |
| download | genkernel-e05ab0d1a1e739e152ec6ef77a6335891f34fe2b.tar.gz genkernel-e05ab0d1a1e739e152ec6ef77a6335891f34fe2b.tar.bz2 genkernel-e05ab0d1a1e739e152ec6ef77a6335891f34fe2b.zip | |
Force ZFS to explicitly import pool when LUKS is present
Diffstat (limited to 'defaults')
| -rwxr-xr-x | defaults/initrd.scripts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 46364de..4f0ce1b 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -674,7 +674,14 @@ startVolumes() { if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "$ZFS_POOL" ] then - good_msg "ZFS pool ${ZFS_POOL} already imported" + good_msg "ZFS pool ${ZFS_POOL} already imported." + + if [ -n "${CRYPT_ROOT}" -o -n "${CRYPT_SWAP}" ] + then + good_msg "LUKS detected. Reimporting ${ZFS_POOL}" + /sbin/zpool export -f "${ZFS_POOL}" + /sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}" + fi else good_msg "Importing ZFS pool ${ZFS_POOL}" |