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

fix arch-install grubinstall function

Browse source
This commit is contained in:
user 2023-06-05 11:22:35 +02:00
parent f3753ce6b7
commit e30d576887
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch-install.sh
View file

@ -731,21 +731,12 @@ function grubinstall() {
fi fi
[[ -z "${aufloesung}" ]] && aufloesung=auto [[ -z "${aufloesung}" ]] && aufloesung=auto
cp /opt/${repo}/configs/grub.d/10_linux ${mountpoint}/etc/grub.d/10_linux
mkdir -p ${mountpoint}/boot/grub/themes/ mkdir -p ${mountpoint}/boot/grub/themes/
#cp -Rv /opt/${repo}/grub-config/themes/poly-light/ ${mountpoint}/boot/grub/themes/ #cp -Rv /opt/${repo}/grub-config/themes/poly-light/ ${mountpoint}/boot/grub/themes/
cp -Rv /opt/${repo}/grub-config/themes/Stylish/ ${mountpoint}/boot/grub/themes/ cp -Rv /opt/${repo}/grub-config/themes/Stylish/ ${mountpoint}/boot/grub/themes/
cp -Rv /opt/${repo}/grub-config/themes/Vimix/ ${mountpoint}/boot/grub/themes/ cp -Rv /opt/${repo}/grub-config/themes/Vimix/ ${mountpoint}/boot/grub/themes/
sed -i 's|GRUB_DISTRIBUTOR=.*$|GRUB_DISTRIBUTOR=\"'$repo'\"|' ${mountpoint}/etc/default/grub sed -i 's|GRUB_DISTRIBUTOR=.*$|GRUB_DISTRIBUTOR=\"'$repo'\"|' ${mountpoint}/etc/default/grub
sed -i 's|GRUB_PRELOAD_MODULES=.*$|GRUB_PRELOAD_MODULES=\"part_gpt part_msdos zstd btrfs lvm\"|' ${mountpoint}/etc/default/grub sed -i 's|GRUB_PRELOAD_MODULES=.*$|GRUB_PRELOAD_MODULES=\"part_gpt part_msdos zstd btrfs lvm\"|' ${mountpoint}/etc/default/grub
if [ "${verschluesselung}" == "y" ] || [ "y" == "${lvmsupport}" ]; then
sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*$|GRUB_CMDLINE_LINUX_DEFAULT=\"\"|' ${mountpoint}/etc/default/grub
else
sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*$|GRUB_CMDLINE_LINUX_DEFAULT=\"\"|' ${mountpoint}/etc/default/grub
fi
#sed -i 's|GRUB_BACKGROUND=.*$|GRUB_BACKGROUND=\"\/usr\/share\/grub\/background.png\"|' ${mountpoint}/etc/default/grub #sed -i 's|GRUB_BACKGROUND=.*$|GRUB_BACKGROUND=\"\/usr\/share\/grub\/background.png\"|' ${mountpoint}/etc/default/grub
#sed -i 's|GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/poly-light\/theme.txt"|' ${mountpoint}/etc/default/grub #sed -i 's|GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/poly-light\/theme.txt"|' ${mountpoint}/etc/default/grub
sed -i 's|#GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/Stylish\/theme.txt"|' ${mountpoint}/etc/default/grub sed -i 's|#GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/Stylish\/theme.txt"|' ${mountpoint}/etc/default/grub
@ -799,6 +790,7 @@ function grubinstall() {
echo "GRUB_CMDLINE_LINUX_DEFAULT_ALT=\"${parameter}\"" >> ${mountpoint}/etc/default/grub echo "GRUB_CMDLINE_LINUX_DEFAULT_ALT=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
echo "GRUB_DISABLE_OS_PROBER=true" >> ${mountpoint}/etc/default/grub echo "GRUB_DISABLE_OS_PROBER=true" >> ${mountpoint}/etc/default/grub
echo "GRUB_SAVEDEFAULT=true" >> ${mountpoint}/etc/default/grub
} }
function btrfsformat() { function btrfsformat() {

2
scripts/extract-menuentry.py
View file

@ -21,7 +21,7 @@ def extract_menuentry(infile):
if line.startswith(menuentry_start): if line.startswith(menuentry_start):
in_menuentry = True in_menuentry = True
match = re.search(r"menuentry '[^']+' (.*)", line) match = re.search(r"menuentry '[^']+' (.*)", line)
print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux alt'), match.group(1))) print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux alt (i3)'), match.group(1)))
pass pass
pass pass
pass pass