summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2013-05-20 18:35:56 -0700
committerAdam Williamson <awilliam@redhat.com>2013-05-20 18:47:56 -0700
commitaecc32586e7284cc6d990abed59c02a042d0e5dc (patch)
tree6e7dbcdb76a6467a42fa73c9482c5508bd689bab
parent6670bc9af0be3b63269d86c60fd7510f8aa3e3aa (diff)
downloadspin-kickstarts-aecc32586e7284cc6d990abed59c02a042d0e5dc.tar.gz
spin-kickstarts-aecc32586e7284cc6d990abed59c02a042d0e5dc.tar.xz
spin-kickstarts-aecc32586e7284cc6d990abed59c02a042d0e5dc.zip
mate: add missing 'fi', make autologin match xfce, fix perms for homedir
Some fixes for the MATE spin. There was a duplicate 'sed' run on liveinst.desktop, one of which was in an 'if' statement with no 'fi'; this meant livesys never completed. Took out one of the runs and added the 'fi' to make livesys complete. Also changed to the style from the Xfce kickstart for LightDM autologin (seems sensible to have it consistent between spins, and we know the Xfce method works) and added the stanza for correcting ownership and SELinux context of /home/liveuser that is present in all other desktop live spins.
-rw-r--r--fedora-live-mate-compiz.ks19
1 files changed, 11 insertions, 8 deletions
diff --git a/fedora-live-mate-compiz.ks b/fedora-live-mate-compiz.ks
index 8d83578..a53d9ae 100644
--- a/fedora-live-mate-compiz.ks
+++ b/fedora-live-mate-compiz.ks
@@ -45,8 +45,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
if [ -f /usr/share/applications/liveinst.desktop ]; then
# Show harddisk install in shell dash
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+fi
mkdir /home/liveuser/Desktop
cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
@@ -54,18 +53,22 @@ cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas
-# set up auto-login
-cat > /etc/lightdm/custom.conf << FOE
-[daemon]
-AutomaticLoginEnable=True
-AutomaticLogin=liveuser
-FOE
+# 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
+
+# set MATE as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf
# Turn off PackageKit-command-not-found while uninstalled
if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
fi
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
EOF
%end