update installer
This commit is contained in:
parent
23263c6101
commit
f74a2ad5a5
18
arch_install
18
arch_install
|
@ -575,7 +575,8 @@ set_daemons() {
|
|||
#}}}
|
||||
# set_bluetooth{{{
|
||||
set_bluetooth() {
|
||||
cat >> /etc/bluetooth/main.conf <<EOF
|
||||
mkdir -p /etc/bluetooth/
|
||||
cat > /etc/bluetooth/main.conf <<EOF
|
||||
|
||||
[General]
|
||||
DiscoverableTimeout = 0
|
||||
|
@ -596,17 +597,16 @@ set_bootctl() {
|
|||
|
||||
local lvm_uuid=$(get_uuid "$lvm_dev")
|
||||
|
||||
local crypt=""
|
||||
if [ -n "$ENCRYPT_DRIVE" ]
|
||||
then
|
||||
# Load in resources
|
||||
crypt="root=UUID=$lvm_uuid"
|
||||
fi
|
||||
local k_args="root=UUID=$lvm_uuid"
|
||||
|
||||
if $IS_BIOS;then
|
||||
grub-install "$DRIVE"
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
|
||||
cat >> /etc/default/grub <<EOF
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="$k_args"
|
||||
# GRUB_CMDLINE_LINUX_DEFAULT="quiet splash loglevel=3 vga=current rd.udev.log_priority=3 rd.systemd.show_status=auto vt.global_cursor_default=0 nmi_watchdog=0 $k_args"
|
||||
EOF
|
||||
else
|
||||
bootctl install
|
||||
cat > /boot/loader/entries/arch.conf <<EOF
|
||||
|
@ -616,8 +616,8 @@ linux vmlinuz-linux-zen
|
|||
initrd intel-ucode.img
|
||||
initrd initramfs-linux-zen.img
|
||||
|
||||
options $crypt
|
||||
#options quiet splash loglevel=3 vga=current rd.udev.log_priority=3 rd.systemd.show_status=auto vt.global_cursor_default=0 nmi_watchdog=0 $crypt
|
||||
options $k_args
|
||||
# options quiet splash loglevel=3 vga=current rd.udev.log_priority=3 rd.systemd.show_status=auto vt.global_cursor_default=0 nmi_watchdog=0 $k_args
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
|
Reference in New Issue