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

minor update

This commit is contained in:
mfgbhatti 2022-02-19 20:51:53 +00:00
parent 2ed9faeb5a
commit 7466e32a59
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0-preinstall.sh
View File

@ -93,7 +93,7 @@ do_format() {
do_lvm() { do_lvm() {
i=0 i=0
while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do while [[ "$i" -le "${#LVM_PART_NUM[@]}" ]]; do
if [[ "${#LVM_PART_NUM[@]}" -eq 1 ]]; then if [[ "${#LVM_PART_NUM[@]}" -eq "1" ]]; then
lvcreate --extents 100%FREE "$LVM_VG" --name "${LVM_NAMES[$i]}" lvcreate --extents 100%FREE "$LVM_VG" --name "${LVM_NAMES[$i]}"
else else
lvcreate --size "${LVM_SIZES[$i]}" "$LVM_VG" --name "${LVM_NAMES[$i]}" lvcreate --size "${LVM_SIZES[$i]}" "$LVM_VG" --name "${LVM_NAMES[$i]}"
@ -137,7 +137,7 @@ do_partition() {
} }
mount_boot() { mount_boot() {
if [[ "$UEFI" -eq 1 ]]; then if [[ "$UEFI" -eq "1" ]]; then
mkdir "$MOUNTPOINT"/boot mkdir "$MOUNTPOINT"/boot
mount -t vfat -L EFIBOOT "$MOUNTPOINT"/boot/ mount -t vfat -L EFIBOOT "$MOUNTPOINT"/boot/
fi fi
@ -159,7 +159,7 @@ reflector --age 48 --country "$ISO" -f 5 --latest 20 --protocol https --sort rat
mkdir "$MOUNTPOINT" &>/dev/null # Hiding error message if any mkdir "$MOUNTPOINT" &>/dev/null # Hiding error message if any
echo "File system setup" echo "File system setup"
if [[ "$SDD" -eq 1 ]]; then if [[ "$SDD" -eq "1" ]]; then
PART1=${DISK}p1 PART1=${DISK}p1
PART2=${DISK}p2 PART2=${DISK}p2
else else
@ -169,13 +169,13 @@ fi
set_option "PART2" "$PART2" set_option "PART2" "$PART2"
if [[ "$LAYOUT" -eq 1 ]]; then if [[ "$LAYOUT" -eq "1" ]]; then
do_partition do_partition
make_boot make_boot
do_btrfs "$ROOT" "$PART2" do_btrfs "$ROOT" "$PART2"
mount_boot mount_boot
elif [[ "$LVM" -eq 1 ]]; then elif [[ "$LVM" -eq "1" ]]; then
PACKAGES+=("lvm2") PACKAGES+=("lvm2")
do_partition do_partition
sgdisk --typecode=2:8e00 "$DISK" sgdisk --typecode=2:8e00 "$DISK"
@ -188,7 +188,7 @@ elif [[ "$LVM" -eq 1 ]]; then
mount_boot mount_boot
set_option "HOOKS" "(lvm2 filesystems)" set_option "HOOKS" "(lvm2 filesystems)"
elif [[ "$LUKS" -eq 1 ]]; then elif [[ "$LUKS" -eq "1" ]]; then
PACKAGES+=("cryptsetup" "lvm2") PACKAGES+=("cryptsetup" "lvm2")
do_partition do_partition
make_boot make_boot
@ -204,7 +204,7 @@ elif [[ "$LUKS" -eq 1 ]]; then
# HOOKS=(base udev autodetect modconf block filesystems keyboard fsck) # HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)
set_option "HOOKS" "(base udev autodetect keyboard keymap consolefont modconf block lvm2 encrypt filesystems fsck)" set_option "HOOKS" "(base udev autodetect keyboard keymap consolefont modconf block lvm2 encrypt filesystems fsck)"
elif [[ "$LAYOUT" -eq 0 ]]; then elif [[ "$LAYOUT" -eq "0" ]]; then
modprobe dm-mod modprobe dm-mod
vgscan &>/dev/null vgscan &>/dev/null
vgchange -ay &>/dev/null vgchange -ay &>/dev/null