Skip to content
Snippets Groups Projects
Commit f32693fc authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Multiple fixes for aramo release

Reimplemented grub background setup
Removed disable-radeon.conf for blobless activation
Configured systemd-resolved to use opportunistic DNSOverTLS
Updated partman recipes
Updated casper configuration file for vesa usage
parent b21e41e1
No related branches found
No related tags found
No related merge requests found
Showing
with 108 additions and 100 deletions
GRUB_BACKGROUND=/boot/background.png
#!/bin/bash -e
source /usr/lib/grub/grub-mkconfig_lib
# this allows desktop-base to override our settings
f=/usr/share/desktop-base/grub_background.sh
if test -e ${f} ; then
source ${f}
else
WALLPAPER="/usr/share/backgrounds/trisquel-grub.png"
if test -f /usr/share/backgrounds/trisquel-grub-custom.png ; then
WALLPAPER="/usr/share/backgrounds/trisquel-grub-custom.png"
fi
COLOR_NORMAL="white/black"
COLOR_HIGHLIGHT="yellow/white"
fi
set_mono_theme()
{
cat << EOF
set menu_color_normal=white/black
set menu_color_highlight=black/light-gray
EOF
}
# check for usable backgrounds
use_bg=false
if [ "$GRUB_TERMINAL_OUTPUT" = "gfxterm" ] ; then
for i in /boot/grub/`basename ${WALLPAPER}` ${WALLPAPER} ; do
if is_path_readable_by_grub $i ; then
bg=$i
case ${bg} in
*.png) reader=png ;;
*.tga) reader=tga ;;
*.jpg|*.jpeg) reader=jpeg ;;
esac
if test -e /boot/grub/${reader}.mod ; then
echo "Found background image: `basename ${bg}`" >&2
use_bg=true
break
fi
fi
done
fi
# set the background if possible
if ${use_bg} ; then
prepare_grub_to_access_device `${grub_probe} --target=device ${bg}`
cat << EOF
insmod ${reader}
if background_image `make_system_path_relative_to_its_root ${bg}` ; then
set color_normal=${COLOR_NORMAL}
set color_highlight=${COLOR_HIGHLIGHT}
else
EOF
fi
# otherwise, set a monochromatic theme
if ${use_bg} ; then
set_mono_theme | sed -e "s/^/ /g"
echo "fi"
else
set_mono_theme
fi
blacklist radeon
......@@ -2,3 +2,4 @@
LLMNR=resolve
MulticastDNS=resolve
Cache=yes
DNSOverTLS=opportunistic
partman-auto/text/home_scheme ::
1 1 1 free
$iflabel{ gpt }
$reusemethod{ }
method{ biosgrub } .
538 538 1075 fat32
$reusemethod{ }
$primary{ }
method{ efi }
format{ } .
1792 1024 2048 ext4
$defaultignore{ }
$lvmignore{ }
method{ format }
format{ }
use_filesystem{ }
filesystem{ ext4 }
mountpoint{ /boot } .
8000 10000 25000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
use_filesystem{ }
$default_filesystem{ }
filesystem{ ext4 }
options/relatime{ relatime }
mountpoint{ / } .
96 512 300% linux-swap
$lvmok{ }
$reusemethod{ }
method{ swap }
format{ } .
4000 10000 -1 $default_filesystem
$lvmok{ }
method{ format }
format{ }
use_filesystem{ }
$default_filesystem{ }
filesystem{ ext4 }
options/relatime{ relatime }
mountpoint{ /home } .
partman-auto/text/home_scheme ::
500 5000 15000 xfs
method{ format }
format{ }
use_filesystem{ }
filesystem{ xfs }
mountpoint{ / }
options/relatime{ relatime } .
$lvmok{ } lv_name{ root }
in_vg { crypt }
1 1 1 free
$iflabel{ gpt }
$reusemethod{ }
method{ biosgrub } .
500 1000 2000 ext4
method{ format }
format{ }
use_filesystem{ }
filesystem{ ext4 }
mountpoint{ /boot }
options/relatime{ relatime } .
538 538 1075 fat32
$reusemethod{ }
$primary{ }
method{ efi }
format{ } .
1792 1024 2048 ext4
$defaultignore{ }
$lvmignore{ }
method{ format }
format{ }
use_filesystem{ }
filesystem{ ext4 }
mountpoint{ /boot } .
8000 10000 25000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
use_filesystem{ }
$default_filesystem{ }
filesystem{ ext4 }
options/relatime{ relatime }
mountpoint{ / } .
96 512 300% linux-swap
$lvmok{ } lv_name{ swap }
in_vg { crypt }
method{ swap }
format{ } .
$lvmok{ }
$reusemethod{ }
method{ swap }
format{ } .
4000 10000 -1 $default_filesystem
$lvmok{ }
method{ format }
format{ }
use_filesystem{ }
$default_filesystem{ }
filesystem{ ext4 }
options/relatime{ relatime }
mountpoint{ /home } .
100 10000 -1 xfs
$lvmok{ } lv_name{ home }
in_vg { crypt }
method{ format }
format{ }
use_filesystem{ }
filesystem{ xfs }
mountpoint{ /home }
options/relatime{ relatime } .
11.0/trisquel-base-data/data/usr/share/backgrounds/trisquel-grub.png

510 KiB

......@@ -22,6 +22,6 @@ grep video=vesa /proc/cmdline || exit
log_begin_msg "$DESCRIPTION"
cp /root/etc/X11/xorg.conf.vesa /root/etc/X11/xorg.conf
cp /root/etc/X11/xorg.conf.vesa /root/usr/share/X11/xorg.conf.d/10-vesa.conf
log_end_msg
trisquel-base-data (11.6) aramo; urgency=medium
* Reimplemented grub background setup
* Removed disable-radeon.conf for blobless activation
* Configured systemd-resolved to use opportunistic DNSOverTLS
* Updated partman recipes
* Updated casper configuration file for vesa usage
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 28 Feb 2023 07:47:24 -0500
trisquel-base-data (11.5) aramo; urgency=medium
* Corrected grub.png size
......
#!/bin/sh
[ -e /etc/modprobe.d/disable-radeon.conf ] && rm /etc/modprobe.d/disable-radeon.conf
[ -e /etc/grub.d/06_trisquel_theme ] && rm /etc/grub.d/06_trisquel_theme
#!/bin/bash
grep -q b43 /etc/modules && sed -i '/b43/d' /etc/modules
exit 0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment