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-12 22:45:23 +00:00
parent 0dca8f7d8c
commit 60434269b8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
0-preinstall.sh
View File

@ -156,6 +156,7 @@ else
PART2=${DISK}2 PART2=${DISK}2
fi fi
set_option "PART2" "$PART2"
if [[ "$LAYOUT" -eq 1 ]]; then if [[ "$LAYOUT" -eq 1 ]]; then
do_partition do_partition

4
1-setup.sh
View File

@ -171,7 +171,7 @@ grub)
sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYP_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYP_UUID}"':luks"/g' /etc/default/grub sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYP_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYP_UUID}"':luks"/g' /etc/default/grub
fi fi
if [[ "$UEFI" -eq 1 ]]; then if [[ "$UEFI" -eq 1 ]]; then
grub-install --target=x86_64-efi --efi-directory="$MOUNTPOINT"/boot --bootloader-id=GRUB --recheck grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB --recheck
else else
grub-install --target=i386-pc --recheck "$DISK" grub-install --target=i386-pc --recheck "$DISK"
fi fi
@ -181,7 +181,6 @@ systemd)
if [[ "$UEFI" -eq 1 ]]; then if [[ "$UEFI" -eq 1 ]]; then
echo "Installing systemd-boot" echo "Installing systemd-boot"
bootctl --path=/boot install bootctl --path=/boot install
if [[ $LUKS -eq 1 ]]; then if [[ $LUKS -eq 1 ]]; then
echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\tcryptdevice=UUID=$ENCRYP_UUID:luks root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\tcryptdevice=UUID=$ENCRYP_UUID:luks root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
elif [[ $LVM -eq 1 ]]; then elif [[ $LVM -eq 1 ]]; then
@ -198,6 +197,7 @@ systemd)
uefi) uefi)
if [[ "$UEFI" -eq 1 ]]; then if [[ "$UEFI" -eq 1 ]]; then
echo "Installing efistub" echo "Installing efistub"
install_pkg efibootmgr
if [[ "$LUKS" -eq 1 && "$FS" =~ "btrfs" ]]; then if [[ "$LUKS" -eq 1 && "$FS" =~ "btrfs" ]]; then
efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux.img" efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux.img"
efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux-fallback.img" efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux-fallback.img"

1
startup.sh
View File

@ -521,6 +521,7 @@ make_choice() {
set_keymap set_keymap
ssd_drive ssd_drive
set_btrfs set_btrfs
set_option "BOOTLOADER" "grub"
set_option "FS" "btrfs" set_option "FS" "btrfs"
set_option "DE" "default" set_option "DE" "default"
set_option "LAYOUT" 1 set_option "LAYOUT" 1