Commit 786c6d6d authored by Philip Müller's avatar Philip Müller
Browse files

[util-iso] set environment QT_STYLE_OVERRIDE in image

- we might need to check if this is needed
- only livecd might be affected do this
parent db67ebae
......@@ -69,6 +69,7 @@ configure_services_live(){
esac
}
# $1: chroot
configure_lsb(){
[[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg
if [ -e $1/etc/lsb-release ] ; then
......@@ -110,6 +111,16 @@ configure_services(){
esac
}
# $1: chroot
configure_environment(){
case ${custom} in
gnome|xfce|openbox|enlightenment|cinnamon|pekwm|lxde|mate)
echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
;;
*) break ;;
esac
}
# $1: chroot
# $2: user
configure_accountsservice(){
......@@ -295,6 +306,7 @@ configure_displaymanager(){
msg2 "Configured: ${displaymanager}"
}
# $1: chroot
configure_xorg_drivers(){
# Disable Catalyst if not present
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep catalyst-utils 2> /dev/null)" ]; then
......
......@@ -114,6 +114,7 @@ configure_custom_image(){
configure_plymouth "$1"
configure_displaymanager "$1"
configure_services "$1"
configure_environment "$1"
msg "Done configuring [${custom}-image]"
}
......
......@@ -414,15 +414,6 @@ configure_env(){
sed -i -e "s~^.*Exec=.*~Exec=mate-terminal -e 'sudo setup'~" "/etc/skel/Desktop/installer-launcher-cli.desktop"
sed -i -e "s~^.*Terminal=.*~Terminal=false~" "/etc/skel/Desktop/installer-launcher-cli.desktop"
fi
if [[ -f "/bootmnt/${iso_name}/${arch}/${custom}-image.sqfs" ]]; then
case ${custom} in
gnome|xfce|openbox|enlightenment|cinnamon|pekwm|lxde|mate)
echo "QT_STYLE_OVERRIDE=gtk" >> /etc/environment
;;
*) break ;;
esac
fi
}
configure_user_root(){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment