From e0bedf10a3990637fc2233681e6ce8f5bfaebf4e Mon Sep 17 00:00:00 2001 From: eichehome Date: Thu, 20 Apr 2023 14:02:01 +0200 Subject: [PATCH 1/3] Fixed Bug #1 --- base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.sh b/base.sh index 525b1b2..d8f1714 100644 --- a/base.sh +++ b/base.sh @@ -241,7 +241,7 @@ fi sed -i 's/BINARIES=()/BINARIES=(btrfs)/' /etc/mkinitcpio.conf -sed -i 's/HOOKS=(.*)/HOOKS=(base systemd keyboard autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf +sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf if [[ $kernel == 1 ]]; then mkinitcpio -p linux From 30feb544820e78b9aae431edb12622efbc2c2dd9 Mon Sep 17 00:00:00 2001 From: eichehome Date: Thu, 20 Apr 2023 14:05:44 +0200 Subject: [PATCH 2/3] Added Plymouth (Fixed #2) --- base.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base.sh b/base.sh index d8f1714..e79ee92 100644 --- a/base.sh +++ b/base.sh @@ -204,7 +204,7 @@ if [[ $configuration == 1 ]]; then cp "$(find "${PWD}" -type f -name 20-wwan.network)" /etc/systemd/network/ elif [[ $configuration == 2 ]]; then - pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome espeak-ng networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon + pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome espeak-ng networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon plymouth pacman -S gnome gdm gnome-software-packagekit-plugin @@ -243,6 +243,10 @@ sed -i 's/BINARIES=()/BINARIES=(btrfs)/' /etc/mkinitcpio.conf sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf +if [[ $configuration == 2 ]]; then + sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard plymouth autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf +fi + if [[ $kernel == 1 ]]; then mkinitcpio -p linux elif [[ $kernel == 2 ]]; then From f902981d8e6d7482d686ad78dbb715505473dd4e Mon Sep 17 00:00:00 2001 From: eichehome Date: Thu, 20 Apr 2023 14:20:30 +0200 Subject: [PATCH 3/3] Added lsblk (Closes #25) --- prep-BTRFS-UEFI-Encrypted.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prep-BTRFS-UEFI-Encrypted.sh b/prep-BTRFS-UEFI-Encrypted.sh index d724578..fa25386 100644 --- a/prep-BTRFS-UEFI-Encrypted.sh +++ b/prep-BTRFS-UEFI-Encrypted.sh @@ -8,6 +8,8 @@ localectl set-keymap de-latin1-nodeadkeys timedatectl set-timezone Europe/Berlin timedatectl set-ntp yes +lsblk +echo "-------------------------------------" echo "Choose Device (Defaults to /dev/sda):" echo "1) /dev/sda 2) /dev/vda 3) Other Path" read -r choise