This commit is contained in:
simono41 2018-05-01 01:57:36 +02:00
parent 8173fcf557
commit 90bc1af3bf
3 changed files with 13 additions and 14 deletions

View file

@ -528,11 +528,7 @@ cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list
cp /opt/${repo}/aurinstall.sh /usr/bin/aurinstaller cp /opt/${repo}/aurinstall.sh /usr/bin/aurinstaller
chmod +x /usr/bin/aurinstaller chmod +x /usr/bin/aurinstaller
if [ "${version}" != "libre" ]; then su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
else
cp /opt/${repo}/arch-logo.png /usr/share/plymouth/arch-logo.png
fi
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git"" su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git""
plymouth-set-default-theme -R dark-arch plymouth-set-default-theme -R dark-arch

View file

@ -279,13 +279,25 @@ function installation {
# module and hooks # module and hooks
parameter="base udev " parameter="base udev "
if [ "${offline}" != "n" ]; then
if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}plymouth-encrypt "
else
parameter="${parameter}plymouth "
fi
fi
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
parameter="${parameter}resume " parameter="${parameter}resume "
fi fi
if [ "${verschluesselung}" == "y" ]; then if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}encrypt " parameter="${parameter}encrypt "
fi fi
parameter="${parameter}block filesystems keyboard " parameter="${parameter}block filesystems keyboard "
if [ "${dateisystem}" == "btrfs" ]; then if [ "${dateisystem}" == "btrfs" ]; then
if [ "${raid}" != "n" ]; then if [ "${raid}" != "n" ]; then
parameter="${parameter}btrfs " parameter="${parameter}btrfs "
@ -296,14 +308,6 @@ function installation {
parameter="${parameter}usbsecret " parameter="${parameter}usbsecret "
fi fi
if [ "${offline}" != "n" ]; then
if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}plymouth-encrypt "
else
parameter="${parameter}plymouth "
fi
fi
echo "" echo ""
if [ "${version}" == "libre" ] || [ "${offline}" == "n" ]; then if [ "${version}" == "libre" ] || [ "${offline}" == "n" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf

View file

@ -86,7 +86,6 @@ os-prober
p7zip p7zip
pavucontrol pavucontrol
pixz pixz
plymouth
ppp ppp
pulseaudio pulseaudio
pulseaudio-alsa pulseaudio-alsa