missed lvm2 hook

This commit is contained in:
mfgbhatti 2022-02-16 19:11:04 +00:00
parent b1191fccc4
commit e0895454f5
3 changed files with 35 additions and 16 deletions

View File

@ -202,7 +202,7 @@ elif [[ "$LUKS" -eq 1 ]]; then
mount_boot mount_boot
# set_option "ENCRYP_PART" "$_PART_UUID" # set_option "ENCRYP_PART" "$_PART_UUID"
# 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 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

View File

@ -15,51 +15,70 @@ else
exit 1 exit 1
fi fi
install_aur() {
"$AURHELPER" -S --noconfirm --needed "$@"
}
cd ~ || exit 1 cd ~ || exit 1
case "$AURHELPER" in case "$AURHELPER" in
"yay") "yay")
install_pkg "git go" install_pkg "go"
git clone "https://aur.archlinux.org/yay.git" git clone "https://aur.archlinux.org/yay.git"
;; ;;
"trizen") "trizen")
install_pkg "git perl" install_pkg "perl"
git clone "https://aur.archlinux.org/trizen.git" git clone "https://aur.archlinux.org/trizen.git"
;; ;;
"aurman") "aurman")
install_pkg "git"
git clone "https://aur.archlinux.org/aurman.git" git clone "https://aur.archlinux.org/aurman.git"
;; ;;
"aura") "aura")
install_pkg "git stack" install_pkg "stack"
git clone "https://aur.archlinux.org/aura.git" git clone "https://aur.archlinux.org/aura.git"
;; ;;
"pikaur") "pikaur")
install_pkg "git"
git clone "https://aur.archlinux.org/pikaur.git" git clone "https://aur.archlinux.org/pikaur.git"
;; ;;
*) *)
something_failed something_failed
;; ;;
esac esac
cd "$AURHELPER" || exit 1 cd "$AURHELPER" || exit 1
makepkg -si --noconfirm makepkg -si --noconfirm
cd ~ || exit 1 cd ~ || exit 1
while IFS= read -r LINE; do
"$AURHELPER" -S --noconfirm --needed - <~/ArchTitus/pkg-files/aur-pkgs.txt echo "INSTALLING: $LINE"
install_aur "$LINE"
done <~/ArchTitus/pkg-files/aur-pkgs.txt
if [[ "$LAYOUT" -eq 1 ]]; then if [[ "$LAYOUT" -eq 1 ]]; then
touch "$HOME/.cache/zshhistory" touch "$HOME/.cache/zshhistory"
git clone "https://github.com/ChrisTitusTech/zsh" git clone "https://github.com/ChrisTitusTech/zsh"
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k git clone --depth=1 "https://github.com/romkatv/powerlevel10k.git" "$HOME"/powerlevel10k
ln -s "$HOME/zsh/.zshrc" ~/.zshrc ln -s "$HOME/zsh/.zshrc" "$HOME"/.zshrc
pip install konsave
konsave -i "$HOME"/ArchTitus/kde.knsv
sleep 1
konsave -a kde
cp -r "$HOME"/ArchTitus/dotfiles/* "$HOME"/.config/
fi fi
case "$DESKTOP" in
"lxqt")
install_aur "sddm-nordic-theme-git"
;;
"awesome")
install_aur "rofi picom i3lock-fancy xclip ttf-roboto polkit-gnome materia-theme lxappearance flameshot pnmixer network-manager-applet xfce4-power-manager qt5-styleplugins papirus-icon-theme"
git clone "https://github.com/ChrisTitusTech/titus-awesome" "$HOME"/.config/awesome
mkdir -p "$HOME"/.config/rofi
cp "$HOME"/.config/awesome/theme/config.rasi "$HOME"/.config/rofi/config.rasi
sed -i "/@import/c\@import $HOME/.config/awesome/theme/sidebar.rasi" "$HOME"/.config/rofi/config.rasi
;;
esac
export PATH=$PATH:~/.local/bin export PATH=$PATH:~/.local/bin
cp -r ~/ArchTitus/dotfiles/* ~/.config/
pip install konsave
konsave -i ~/ArchTitus/kde.knsv
sleep 1
konsave -a kde
title "System ready for 3-post-setup.sh" title "System ready for 3-post-setup.sh"

View File

@ -36,7 +36,7 @@ do_reboot () {
end() { end() {
logo logo
for (( i = 15; i >= 1; i-- )); do for (( i = 15; i >= 1; i-- )); do
read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY# read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
CODE="$?" CODE="$?"
if [ "$CODE" != "0" ]; then if [ "$CODE" != "0" ]; then
continue continue