From 225ede7fc5824c3a25196017a62cffbad009a629 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sun, 15 May 2022 19:55:42 -0700 Subject: [PATCH] lightdm will be available in EPEL --- Rocky-8-XFCE.ks | 29 +++++++------------------- live/8/prod/rocky-live-xfce-common.ks | 5 +---- live/8/prod/rocky-live-xfce.ks | 26 ++++++----------------- live/8/stage/rocky-live-xfce-common.ks | 5 +---- live/8/stage/rocky-live-xfce.ks | 26 ++++++----------------- 5 files changed, 21 insertions(+), 70 deletions(-) diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks index 20cbbdc..8e4c6f6 100644 --- a/Rocky-8-XFCE.ks +++ b/Rocky-8-XFCE.ks @@ -317,7 +317,7 @@ touch /etc/machine-id cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF @@ -349,26 +349,12 @@ mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml # set up lightdm autologin -#sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -#sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf # set Xfce as default session, otherwise login will fail -#sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf - -# lightdm does not install on EL8 properly - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=xfce.desktop/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=xfce.desktop -SDDM_EOF -fi +sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf # debrand #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop @@ -404,7 +390,7 @@ restorecon -R /home/liveuser EOF # this doesn't come up automatically. not sure why. -systemctl enable --force sddm.service +systemctl enable --force lightdm.service dnf config-manager --set-enabled powertools %end @@ -469,8 +455,7 @@ pidgin rhythmbox ristretto rocky-backgrounds -sddm -sddm-themes +lightdm seahorse syslinux thunderbird diff --git a/live/8/prod/rocky-live-xfce-common.ks b/live/8/prod/rocky-live-xfce-common.ks index 73c2dfb..2df7f08 100644 --- a/live/8/prod/rocky-live-xfce-common.ks +++ b/live/8/prod/rocky-live-xfce-common.ks @@ -17,10 +17,7 @@ ristretto seahorse transmission pcp-selinux -sddm -sddm-breeze -sddm-themes -#lightdm +lightdm #gdm -gdm -gnome-shell diff --git a/live/8/prod/rocky-live-xfce.ks b/live/8/prod/rocky-live-xfce.ks index a8c89f7..b022566 100644 --- a/live/8/prod/rocky-live-xfce.ks +++ b/live/8/prod/rocky-live-xfce.ks @@ -13,7 +13,7 @@ part / --size 6144 cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF @@ -45,26 +45,12 @@ mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml # set up lightdm autologin -#sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -#sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf # set Xfce as default session, otherwise login will fail -#sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf - -# lightdm does not install on EL8 properly - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=xfce.desktop/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=xfce.desktop -SDDM_EOF -fi +sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf # debrand #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop @@ -100,7 +86,7 @@ restorecon -R /home/liveuser EOF # this doesn't come up automatically. not sure why. -systemctl enable --force sddm.service +systemctl enable --force lightdm.service dnf config-manager --set-enabled powertools %end diff --git a/live/8/stage/rocky-live-xfce-common.ks b/live/8/stage/rocky-live-xfce-common.ks index 73c2dfb..2df7f08 100644 --- a/live/8/stage/rocky-live-xfce-common.ks +++ b/live/8/stage/rocky-live-xfce-common.ks @@ -17,10 +17,7 @@ ristretto seahorse transmission pcp-selinux -sddm -sddm-breeze -sddm-themes -#lightdm +lightdm #gdm -gdm -gnome-shell diff --git a/live/8/stage/rocky-live-xfce.ks b/live/8/stage/rocky-live-xfce.ks index a8c89f7..b022566 100644 --- a/live/8/stage/rocky-live-xfce.ks +++ b/live/8/stage/rocky-live-xfce.ks @@ -13,7 +13,7 @@ part / --size 6144 cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF @@ -45,26 +45,12 @@ mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml # set up lightdm autologin -#sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -#sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf # set Xfce as default session, otherwise login will fail -#sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf - -# lightdm does not install on EL8 properly - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=xfce.desktop/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=xfce.desktop -SDDM_EOF -fi +sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf # debrand #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop @@ -100,7 +86,7 @@ restorecon -R /home/liveuser EOF # this doesn't come up automatically. not sure why. -systemctl enable --force sddm.service +systemctl enable --force lightdm.service dnf config-manager --set-enabled powertools %end