design: comment OEF line

Revert "This makes compsoes blow up so need to revert"

This reverts commit e853d96f22.

fedora-arm-base.ks

@@ -23,6 +23,8 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae
 
+dracut-config-generic
+
 chrony
 arm-boot-config
 extlinux-bootloader

fedora-cloud-base.ks

@@ -29,7 +29,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 2048 --fstype ext4
+part / --size 1000 --fstype ext4
 
 %include fedora-repo.ks
 
@@ -195,26 +195,8 @@ yum history new
 yum clean all
 truncate -c -s 0 /var/log/yum.log
 
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -m)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-
 echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files

fedora-desktop-packages.ks

@@ -20,12 +20,4 @@ nss-mdns
 # https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
 -rsyslog
 
-# Remove a few apps that are being presented as featured apps in
-# gnome-software
--transmission-gtk
--simple-scan
--gnome-photos
--gnome-maps
--gnome-weather
-
 %end

fedora-install-fedora.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)

fedora-kde-packages.ks

@@ -7,10 +7,6 @@
 ### The KDE-Desktop
 
 ### fixes
-# sddm->kdm, (temporary) so don't have to wait on comps changes
--sddm
--sddm-kcm
-kdm
 
 # use kde-print-manager instead of system-config-printer
 -system-config-printer

fedora-live-design-suite.ks

@@ -31,7 +31,6 @@ gimp-gap
 gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
-gimp-paint-studio
 gimp-resynthesizer
 gpick
 GREYCstoration-gimp 
@@ -59,10 +58,6 @@ filezilla
 audacity
 pitivi
 
-# system
-# gtk-recordmydesktop # dropped for space (#887991)
-# network-manager-applet #part of Gnome Desktop
-
 # fonts
 aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
@@ -104,30 +99,30 @@ overpass-fonts
 #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', 'evolution.desktop', 'shotwell.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', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 #Enable categories in Gnome Shell
 app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
 FOE
 
 # Add link to the Inkscape Course
-#cat >> /usr/share/applications/inkscape-course.desktop << FOE
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
-#[Desktop Entry]
+[Desktop Entry]
-#Name=Introduction To Inkscape
+Name=Introduction To Inkscape
-#GenericName=Inkscape Course
+GenericName=Inkscape Course
-#Comment=Materials from Máirín Duffy's Inkscape Class
+Comment=Materials from Máirín Duffy's Inkscape Class
-#Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
-#Type=Application
+Type=Application
-#Icon=fedora-logo-icon
+Icon=fedora-logo-icon
-#Categories=Graphics;Documentation;
+Categories=Graphics;Documentation;
-#FOE
+FOE
-#chmod a+x /usr/share/applications/inkscape-course.desktop
+chmod a+x /usr/share/applications/inkscape-course.desktop
 
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
-Name=List of Design Tutorials
+Name=List of design tutorials
-GenericName=List of design tutorials
+GenericName=List of Tutorials for Designers
-Comment=Reference of graphic and web design related tutorials
+Comment=Reference of Design Related Tutorials
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics

fedora-live-kde-base.ks

@@ -40,12 +40,11 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
 
 # set up user liveuser as default user and preselected user
-sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
-sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
+sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
 
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/

fedora-livecd-mate-compiz.ks

@@ -11,8 +11,27 @@
 -planner
 
 # Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-@dial-up
+-dnf
 -firefox
+-gnome-bluetooth-libs
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-user-docs
+-@guest-desktop-agents
 -@libreoffice
+-@mate-applications
+-mate-bluetooth
+-mate-icon-theme-faenza
+-transmission-gtk
+
+# Drop oversized fonts that aren't needed
+-cjkuni-uming-fonts
+-wqy-zenhei-fonts
 
 # A web browser would be nice for a live cd
 midori
@@ -65,8 +84,8 @@ midori
 -ntsysv
 
 # Drop some system-config things
--system-config-boot
 -system-config-language
+-system-config-printer
 -system-config-rootpassword
 -system-config-services
 -policycoreutils-gui
@@ -78,4 +97,3 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 %end
-

fedora-livecd-security.ks

@@ -24,15 +24,14 @@ part / --size 10240
 %packages
 @xfce-desktop
 @xfce-apps
-#@xfce-extra-plugins
-#@xfce-media
-#@xfce-office
-#@firefox
 
 # Security tools (not ready at the moment)
 @security-lab
 security-menus
 
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+
 # save some space
 -autofs
 -acpid
@@ -41,13 +40,16 @@ security-menus
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
+-gnumeric
+-foomatic-db-ppds
+-foomatic
+-stix-fonts
+-ibus-typing-booster
+-xfce4-sensors-plugin
 -man-pages-*
 
 # drop some system-config things
--system-config-boot
-#-system-config-network
 -system-config-rootpassword
-#-system-config-services
 -policycoreutils-gui
 
 # exclude some packages to save some space

fedora-livecd-soas.ks

@@ -26,8 +26,8 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 10
+Sugar on a Stick 10 (Unknown)
-Fedora release 20 (Heisenbug)
+Fedora release 20 (Rawhide)
 EOF
 
 # Add our activities to the favorites

fedora-lxde-packages.ks

@@ -12,9 +12,7 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-
+@firefox
-# FIXME: can be omitted once comps is updated
-midori
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -37,6 +35,9 @@ metacity
 #-man-pages-*
 #-words
 
+# use ssmtp
+ssmtp
+
 # save some space
 -autofs
 -acpid
@@ -49,7 +50,10 @@ metacity
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
-#-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+
+# FIXME: can be removed once mtpaint is gone from lxde-apps in comps
+-mtpaint
 
 # drop some system-config things
 -system-config-boot

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-#%include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-not-rawhide.ks