refactor(iso): ZFS partition selection happens only inside setup_zpool (#1)
This commit is contained in:
parent
1fb3cc37eb
commit
97bebe9a99
10
setup.sh
10
setup.sh
@ -188,8 +188,8 @@ function export_pool () {
|
||||
}
|
||||
|
||||
function setup_zpool () {
|
||||
declare zpool_drive drive_by_id
|
||||
zpool_drive="${1:?}"
|
||||
local zpool_drive drive_by_id
|
||||
zpool_drive="$(select_part 'zfs')"
|
||||
drive_by_id="$(get_drive_id "${zpool_drive}")"
|
||||
|
||||
set_zpool_password
|
||||
@ -569,13 +569,9 @@ function main () {
|
||||
else
|
||||
set_ntp
|
||||
update_pacman_db
|
||||
|
||||
install_pkgs 'jq'
|
||||
local zfs_part
|
||||
zfs_part="$(select_part 'zfs')"
|
||||
|
||||
install_zfs
|
||||
setup_zpool "${zfs_part}"
|
||||
setup_zpool
|
||||
mount_system
|
||||
copy_zpool_cache
|
||||
install_archlinux
|
||||
|
Loading…
x
Reference in New Issue
Block a user