simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

boot-fix

Browse source
This commit is contained in:
simono41 2018-08-26 18:47:50 +02:00
parent 03a00cd5a4
commit 4d194cb37e
1 changed files with 1027 additions and 1031 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch-install
View file

@ -324,10 +324,10 @@ function removeinstaller {
}
function freshinstall {
if [ "${update}" != "n" ] && [ "${offline}" != "n" ]; then
if [ "${update}" != "n" ] && [ "${offline}" != "n" ]; then
cp -v /opt/${repo}/update-packages ${mountpoint}/usr/bin/update-packages
arch-chroot ${mountpoint} update-packages
fi
fi
}
function installation {
@ -567,7 +567,6 @@ function grubinstall() {
sed -i 's/GRUB_DISTRIBUTOR=.*$/GRUB_DISTRIBUTOR=\"'$repo'\"/' ${mountpoint}/etc/default/grub
sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT="splash"/' ${mountpoint}/etc/default/grub
if [ "${verschluesselung}" == "y" ]; then
if [ "${boot}" == "grub" ]; then
tobootdevice=$(blkid -s PARTUUID -o value ${device}${rootpartitionnummer})
if [ "${swap}" != "n" ]; then
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
@ -584,9 +583,7 @@ function grubinstall() {
fi
fi
echo "GRUB_ENABLE_CRYPTODISK=y" >> ${mountpoint}/etc/default/grub
fi
else
if [ "${boot}" == "grub" ]; then
tobootdevice=$(blkid -s PARTUUID -o value ${device}${rootpartitionnummer})
if [ "${swap}" != "n" ]; then
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
@ -595,7 +592,6 @@ function grubinstall() {
sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub
fi
fi
fi
}
function btrfsformat() {