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.
This commit is contained in:
parent
6670bc9af0
commit
aecc32586e
@ -45,8 +45,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
|
|||||||
if [ -f /usr/share/applications/liveinst.desktop ]; then
|
if [ -f /usr/share/applications/liveinst.desktop ]; then
|
||||||
# Show harddisk install in shell dash
|
# Show harddisk install in shell dash
|
||||||
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
|
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
|
||||||
# Show harddisk install on the desktop
|
fi
|
||||||
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
|
|
||||||
mkdir /home/liveuser/Desktop
|
mkdir /home/liveuser/Desktop
|
||||||
cp /usr/share/applications/liveinst.desktop /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
|
# rebuild schema cache with any overrides we installed
|
||||||
glib-compile-schemas /usr/share/glib-2.0/schemas
|
glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||||
|
|
||||||
# set up auto-login
|
# set up lightdm autologin
|
||||||
cat > /etc/lightdm/custom.conf << FOE
|
sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
|
||||||
[daemon]
|
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||||
AutomaticLoginEnable=True
|
#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
|
||||||
AutomaticLogin=liveuser
|
|
||||||
FOE
|
# 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
|
# Turn off PackageKit-command-not-found while uninstalled
|
||||||
if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
|
if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
|
||||||
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
|
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# make sure to set the right permissions and selinux contexts
|
||||||
|
chown -R liveuser:liveuser /home/liveuser/
|
||||||
|
restorecon -R /home/liveuser/
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
Loading…
Reference in New Issue
Block a user