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

commit d54d6665a0700493390032c7a252b28fb5e7cf01
Author: crazy <[email protected]>
Date:   Sat Oct 21 13:15:37 2017 +0200

now really fix sddm.conf stuff

diff --git a/bin/fvbe-make-iso b/bin/fvbe-make-iso
index 14ea3a4..5c660f7 100755
--- a/bin/fvbe-make-iso
+++ b/bin/fvbe-make-iso
@@ -267,10 +267,13 @@ fvbe_calamares_files() {
sed -i "s/_version_/$FVBE_ISO_RELEASE/" 
${FVBE_ROOT}/usr/share/calamares/branding/frugalware/branding.desc
sed -i "s/_versionedname_/$(cat $FVBE_ROOT/etc/frugalware-release)/" 
${FVBE_ROOT}/usr/share/calamares/branding/frugalware/branding.desc

-       if [[ -f 
"${FVBE_ROOT}/usr/lib/sddm/sddm.conf.d/20-frugalware-sddm.conf" ]]; then
+
+       local 
SDDM_conf="${FVBE_ROOT}/usr/lib/sddm/sddm.conf.d/20-frugalware-sddm.conf"
+
+       if [[ -f "$SDDM_conf" ]]; then
fvbe_plain_msg "Setting SDDM Session=$session"
-               sed -i "s|^Session=.*\$|Session=$session|" 
${FVBE_ROOT}/etc/sddm.conf
-               sed -i "s|^User=.*\$|User=guest|" ${FVBE_ROOT}/etc/sddm.conf
+               sed -i "s|^Session=.*\$|Session=$session|" $SDDM_conf
+               sed -i "s|^User=.*\$|User=guest|" $SDDM_conf
else ## fixme xinitrc ?
fvbe_info_msg "Something is broken here can't find SDDM and is the only 
supported DM.."
fvbe_error_msg "Abording.."
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to