quico-os-setup/arch-zbm
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

refactor(iso): ZFS partition selection happens only inside setup_zpool (#1)

Browse Source
This commit is contained in:
hygienic-books 2023-02-21 03:27:56 +01:00
parent 1fb3cc37eb
commit 97bebe9a99
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup.sh
View File

@ -188,8 +188,8 @@ function export_pool () {
} }
function setup_zpool () { function setup_zpool () {
declare zpool_drive drive_by_id local zpool_drive drive_by_id
zpool_drive="${1:?}" zpool_drive="$(select_part 'zfs')"
drive_by_id="$(get_drive_id "${zpool_drive}")" drive_by_id="$(get_drive_id "${zpool_drive}")"
set_zpool_password set_zpool_password
@ -569,13 +569,9 @@ function main () {
else else
set_ntp set_ntp
update_pacman_db update_pacman_db
install_pkgs 'jq' install_pkgs 'jq'
local zfs_part
zfs_part="$(select_part 'zfs')"
install_zfs install_zfs
setup_zpool "${zfs_part}" setup_zpool
mount_system mount_system
copy_zpool_cache copy_zpool_cache
install_archlinux install_archlinux