Merge pull request #66 from ublue-os/restore-sddm-conf

fix(desktop): Use sddm.conf for autologin
This commit is contained in:
Kyle Gospodnetich 2023-07-22 08:56:11 -07:00 committed by GitHub
commit b1f1e81e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View File

@ -92,9 +92,6 @@ RUN pip install --prefix=/usr yafti && \
systemctl disable rpm-ostreed-automatic.timer && \ systemctl disable rpm-ostreed-automatic.timer && \
systemctl --global enable ublue-update.timer && \ systemctl --global enable ublue-update.timer && \
systemctl enable input-remapper.service && \ systemctl enable input-remapper.service && \
rm -f \
/usr/etc/sddm.conf \
/etc/sddm.conf && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \
/var/* && \ /var/* && \
@ -184,11 +181,13 @@ RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
mv /etc/sddm.conf /etc/sddm.conf.d/steamos.conf && \
systemctl enable plasma-autologin.service && \ systemctl enable plasma-autologin.service && \
systemctl enable jupiter-fan-control.service && \ systemctl enable jupiter-fan-control.service && \
systemctl enable set-cfs-tweaks.service && \ systemctl enable set-cfs-tweaks.service && \
systemctl disable input-remapper.service && \ systemctl disable input-remapper.service && \
systemctl --global disable ublue-update.timer && \ systemctl --global disable ublue-update.timer && \
rm -f /usr/etc/sddm.conf && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \
/var/* && \ /var/* && \

View File

@ -4,6 +4,14 @@ USER=$(id -nu 1000)
# SteamOS SDDM config # SteamOS SDDM config
SDDM_CONF='/etc/sddm.conf.d/steamos.conf' SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
if [ ! -f ${SDDM_CONF} ]; then
# Fallback to sddm.conf
SDDM_CONF = '/etc/sddm.conf'
KDE_SETTINGS = '/etc/sddm.conf.d/kde_settings.conf'
if [ -f ${KDE_SETTINGS} ]; then
rm -f ${KDE_SETTINGS}
fi
fi
# Configure autologin # Configure autologin
sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF} sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}