Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=35289d9d9d13925044d110c5c7367828e57cdb75

commit 35289d9d9d13925044d110c5c7367828e57cdb75
Author: crazy <cr...@frugalware.org>
Date:   Thu Jul 13 17:16:59 2017 +0200

fvbe-make-iso: fix enlightenment session name for SDDM

diff --git a/bin/fvbe-make-iso b/bin/fvbe-make-iso
index f4e583f..058c78f 100755
--- a/bin/fvbe-make-iso
+++ b/bin/fvbe-make-iso
@@ -215,8 +215,15 @@ fvbe_calamares_files() {


fvbe_info_msg "Setting up calamares files.."
-       local cala="$FVBE_ROOT/etc/calamares" 
cala_files="$FVBE_ROOT/usr/share/calamares/branding/frugalware/"
+       local cala="$FVBE_ROOT/etc/calamares" 
cala_files="$FVBE_ROOT/usr/share/calamares/branding/frugalware/" session

+       if [[ ${FVBE_ISO_TYPE} == "plasma" ]]; then
+               session=plasma.desktop
+       elif [[ ${FVBE_ISO_TYPE} == "enlightenment" ]]; then
+               session=enlightenment.desktop
+       fi
+
+       fvbe_plain_msg "Setting SDDM Session=$session"
[[ ! -d ${cala} ]] && mkdir -p ${cala}
[[ ! -d ${cala_files} ]] && mkdir -p ${cala_files}

@@ -233,7 +240,7 @@ fvbe_calamares_files() {
cp -r calamares/polkit/49-nopasswd_calamares.rules 
${FVBE_ROOT}/etc/polkit-1/rules.d/

if [[ -f "${FVBE_ROOT}/etc/sddm.conf" ]]; then
-               sed -i "s|^Session=.*\$|Session=plasma.desktop|" 
${FVBE_ROOT}/etc/sddm.conf
+               sed -i "s|^Session=.*\$|Session=$session|" 
${FVBE_ROOT}/etc/sddm.conf
sed -i "s|^User=.*\$|User=guest|" ${FVBE_ROOT}/etc/sddm.conf
fi
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to