manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor typs and fixes

This commit is contained in:
oddlama 2020-10-03 16:40:47 +02:00
parent 64251a3d31
commit 89cbd4ae9c
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/internal_config.sh
View File

@ -240,7 +240,7 @@ expand_ids() {
# luks=[true|false] Encrypt root partition. Defaults to false. # luks=[true|false] Encrypt root partition. Defaults to false.
# root_fs=[ext4|btrfs] root fs # root_fs=[ext4|btrfs] root fs
create_default_disk_layout() { create_default_disk_layout() {
local known_arguments=('+swap' '?type' '?use_luks' '?root_fs') local known_arguments=('+swap' '?type' '?luks' '?root_fs')
local extra_arguments=() local extra_arguments=()
declare -A arguments; parse_arguments "$@" declare -A arguments; parse_arguments "$@"
@ -344,8 +344,8 @@ create_raid0_luks_layout() {
# type=[efi|bios] Selects the boot type. Defaults to efi. # type=[efi|bios] Selects the boot type. Defaults to efi.
# luks=[true|false] Encrypt root partitions / devices? Defaults to false. # luks=[true|false] Encrypt root partitions / devices? Defaults to false.
# raid_type=[stripe|mirror] Select raid type. Defaults to stripe. # raid_type=[stripe|mirror] Select raid type. Defaults to stripe.
create_luks_btrfs_raid_layout() { create_btrfs_raid_layout() {
local known_arguments=('+swap' '?type' '?raid_type' '?use_luks') local known_arguments=('+swap' '?type' '?raid_type' '?luks')
local extra_arguments=() local extra_arguments=()
declare -A arguments; parse_arguments "$@" declare -A arguments; parse_arguments "$@"
@ -369,9 +369,11 @@ create_luks_btrfs_raid_layout() {
create_partition new_id="part_swap_dev0" id="gpt_dev0" size="$size_swap" type=raid create_partition new_id="part_swap_dev0" id="gpt_dev0" size="$size_swap" type=raid
create_partition new_id="part_root_dev0" id="gpt_dev0" size=remaining type=raid create_partition new_id="part_root_dev0" id="gpt_dev0" size=remaining type=raid
local root_id
local root_ids="" local root_ids=""
if [[ "$use_luks" == "true" ]]; then if [[ "$use_luks" == "true" ]]; then
create_luks new_id=luks_dev0 name="luks_root_0" id=part_root_dev0 create_luks new_id=luks_dev0 name="luks_root_0" id=part_root_dev0
root_id="luks_dev0"
root_ids="${root_ids}luks_dev0;" root_ids="${root_ids}luks_dev0;"
for i in "${!extra_arguments[@]}"; do for i in "${!extra_arguments[@]}"; do
[[ $i != 0 ]] || continue [[ $i != 0 ]] || continue
@ -380,6 +382,7 @@ create_luks_btrfs_raid_layout() {
done done
else else
local dev_id="" local dev_id=""
root_id="part_root_dev0"
root_ids="${root_ids}part_root_dev0;" root_ids="${root_ids}part_root_dev0;"
for i in "${!extra_arguments[@]}"; do for i in "${!extra_arguments[@]}"; do
[[ $i != 0 ]] || continue [[ $i != 0 ]] || continue