RomanNum3ral
/
ArchTitus
mirror of https://github.com/ChrisTitusTech/ArchTitus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some changes luks

This commit is contained in:
mfgbhatti 2022-02-06 15:02:34 +00:00
parent 57708e6b03
commit 0da28fb372
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0-preinstall.sh
View File

@ -52,9 +52,9 @@ do_lvm() {
i=0 i=0
while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do
if [[ "$i" -eq "${#LVM_PART_NUM[@]}" ]]; then if [[ "$i" -eq "${#LVM_PART_NUM[@]}" ]]; then
lvcreate -l 100%FREE "$LVM_VG" -n "${LVM_NAMES[$i]}" lvcreate --extents 100%FREE "$LVM_VG" --name`` "${LVM_NAMES[$i]}"
else else
lvcreate -L "${LVM_SIZES[$i]}" "$LVM_VG" -n "${LVM_NAMES[$i]}" lvcreate --size "${LVM_SIZES[$i]}" "$LVM_VG" --name "${LVM_NAMES[$i]}"
fi fi
i=$((i + 1)) i=$((i + 1))
done done
@ -63,21 +63,17 @@ do_lvm() {
lvm_mount() { lvm_mount() {
vgchange -ay &>/dev/null vgchange -ay &>/dev/null
i=0 i=0
if [[ "$LUKS" -eq 1 ]]; then
LVM_PATH=/dev/mapper/
else
LVM_PATH=/dev/"$LVM_VG"/ LVM_PATH=/dev/"$LVM_VG"/
fi
while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do
lvchange -ay "$LVM_PATH""${LVM_NAMES[$i]}" &>/dev/null lvchange -ay "$LVM_PATH ${LVM_NAMES[$i]}" &>/dev/null
do_format "$LVM_PATH""${LVM_NAMES[$i]}" do_format "$LVM_PATH ${LVM_NAMES[$i]}"
i=$((i + 1)) i=$((i + 1))
done done
mount "$LVM_PATH""${LVM_NAMES[0]}" "$MOUNTPOINT" mount "$LVM_PATH ${LVM_NAMES[0]}" "$MOUNTPOINT"
for x in "${LVM_NAMES[@]:1}"; do for x in "${LVM_NAMES[@]:1}"; do
mkdir "$MOUNTPOINT"/"$x" mkdir "$MOUNTPOINT"/"$x"
mount "$LVM_PATH""$x" "$MOUNTPOINT"/"$x" mount "$LVM_PATH $x" "$MOUNTPOINT"/"$x"
done done
} }

2
startup.sh
View File

@ -475,7 +475,7 @@ set_locale() {
PS3="$PROMPT" PS3="$PROMPT"
select LOCALE in "${LOCALES[@]}"; do select LOCALE in "${LOCALES[@]}"; do
if elements_present "$LOCALE" "${LOCALES[@]}"; then if elements_present "$LOCALE" "${LOCALES[@]}"; then
set_option "LOCALE" "${LOCALE}.UTF-8 UTF-8" set_option "LOCALE" "\"${LOCALE}.UTF-8 UTF-8\""
break break
else else
invalid_option invalid_option