Merge branch 'f25' of https://pagure.io/forks/luya/fedora-kickstarts into f25

Signed-off-by: Peter Robinson <Peter Robinson pbrobinson@fedoraproject.org>

fedora-arm-soas.ks

@@ -2,6 +2,104 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-packages.ks
 
+firewall --enabled --service=mdns,presence
+
 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# Get proper release naming in the control panel
+cat >> /boot/olpc_build << EOF
+Sugar on a Stick
+EOF
+cat /etc/fedora-release >> /boot/olpc_build
+
+# Add our activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << EOF
+org.laptop.WebActivity
+org.laptop.HelpActivity
+org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
+org.laptop.Calculate
+org.laptop.Clock
+org.laptop.ImageViewerActivity
+org.laptop.Memorize
+org.laptop.physics
+org.laptop.Pippy
+org.laptop.RecordActivity
+org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
+org.laptop.community.TypingTurtle
+org.laptop.sugar.Jukebox
+org.laptop.Words
+org.eq.FotoToon
+org.gnome.Labyrinth
+com.laptop.Ruler
+org.sugarlabs.AbacusActivity
+org.sugarlabs.IRC
+org.sugarlabs.InfoSlicer
+org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
+org.sugarlabs.VisualMatchActivity
+com.garycmartin.Moon
+mulawa.Countries
+tv.alterna.Clock
+vu.lux.olpc.Maze
+vu.lux.olpc.Speak
+EOF
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/sugar
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+# 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
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+
+# Don't use the default system user (in SoaS liveuser) as nick name
+# Disable the logout menu item in Sugar
+# Enable Sugar power management
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+FOE
+
+# rebuild schema cache with any overrides we installed
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end

fedora-live-design_suite.ks

@@ -1,11 +1,11 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
 # Description:
-# - A Spin targeted towards professional designers
+# - A collection of applications targeted towards professional visual designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainers:
+# Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Previous maintainer Sebastian Dziallas
+# - Credit to Sebastian Dziallas for initiating the project
 
 %include fedora-live-workstation.ks
 
@@ -39,22 +39,23 @@ gimpfx-foundry
 gmic-gimp
 inkscape-psd
 inkscape-sozi
-LuxRender-blender
+inkscape-table
+#LuxRender-blender Comment that line because i86 support is no longer available
 sane-backends-drivers-scanners
 xsane-gimp
 #YafaRay-blender
 
-# Preview Gnome Photos
+# Add extra gnome applications
+gnome-books
+gnome-calendar
 gnome-photos
 
-# Add gthumb for renaming group files
-gthumb
-
 # Extra wallpapers
-f23-backgrounds-extras-base
-f23-backgrounds-extras-gnome
 f24-backgrounds-extras-base
 f24-backgrounds-extras-gnome
+f25-backgrounds-extras-base
+f25-backgrounds-extras-gnome
+
 
 # removal of unneeded applications
 -gnome-boxes
@@ -67,7 +68,7 @@ f24-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'darktable.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials

fedora-live-soas.ks

@@ -76,6 +76,8 @@ EOF
 # 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
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
 
 # Don't use the default system user (in SoaS liveuser) as nick name
 # Disable the logout menu item in Sugar
@@ -90,19 +92,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-# 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 Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
-EOF
-
-cat >> /etc/rc.d/init.d/livesys-late << EOF
 
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
@@ -117,12 +106,7 @@ disable-lock-screen=true
 FOE
 
 # rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-EOF
-
-chmod 755 /etc/rc.d/init.d/livesys-late
-/sbin/restorecon /etc/rc.d/init.d/livesys-late
-/sbin/chkconfig --add livesys-late
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end

fedora-soas-packages.ks

@@ -33,6 +33,7 @@
 -ibus*
 -hyperv-daemons
 -webkitgtk4-plugin-process-gtk2
+webkitgtk3
 
 # Add some extra fonts
 dejavu-sans-fonts