set releasever and basearch so we can find the right RPM GPG key to import

because that's more useful in openstack. Note does not affect pvgrub
(and therefore ec2)

fedora-cloud-base.ks

@@ -19,14 +19,12 @@ auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
-# this is actually not used, but a static firewall
+firewall --disabled
-# matching these rules is generated below.
-firewall --service=ssh
 
-bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
 
 network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 
 zerombr
@@ -63,10 +61,6 @@ syslinux-extlinux
 # Needed initially, but removed below.
 firewalld
 
-# Basic firewall. If you're going to rely on your cloud service's
-# security groups you can remove this.
-iptables-services
-
 # cherry-pick a few things from @standard
 tar
 rsync
@@ -135,28 +129,6 @@ yum -C -y remove linux-firmware
 echo "Removing firewalld."
 yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
 
-# Non-firewalld-firewall
-echo -n "Writing static firewall"
-cat <<EOF > /etc/sysconfig/iptables
-# Simple static firewall loaded by iptables.service. Replace
-# this with your own custom rules, run lokkit, or switch to 
-# shorewall or firewalld as your needs dictate.
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
--A INPUT -p icmp -j ACCEPT
--A INPUT -i lo -j ACCEPT
--A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
--A INPUT -j REJECT --reject-with icmp-host-prohibited
--A FORWARD -j REJECT --reject-with icmp-host-prohibited
-COMMIT
-EOF
-echo .
-
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
@@ -223,8 +195,26 @@ 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-kde-packages.ks

@@ -7,6 +7,10 @@
 ### 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-base.ks

@@ -280,6 +280,8 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
+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 LiveCD"
 rpm -qa

fedora-live-design-suite.ks

@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -27,8 +27,11 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-gap
+gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
+gimp-paint-studio
 gimp-resynthesizer
 gpick
 GREYCstoration-gimp 
@@ -101,44 +104,41 @@ 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']
+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
 
-<<<<<<< HEAD
+# Add link to lists of tutorials
-=======
-# Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
-Name=List of design tutorials
+Name=List of Design Tutorials
-GenericName=Design tutorials
+GenericName=List of design tutorials
-Comment=List of websites using open source design software
+Comment=Reference of graphic and web design related tutorials
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
->>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-EOF
+#EOF
 
 %end
 

fedora-live-jam-kde.ks

@@ -76,7 +76,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour
+ardour3
 rosegarden4
 seq24
 muse
@@ -124,6 +124,9 @@ lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
+lv2-sorcer
+lv2-fabla
+lv2-artyfx-plugins
 
 #dssi
 nekobee-dssi

fedora-live-kde-base.ks

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

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 (Unknown)
+Sugar on a Stick 10
-Fedora release 20 (Rawhide)
+Fedora release 20 (Heisenbug)
 EOF
 
 # Add our activities to the favorites

fedora-lxde-packages.ks

@@ -12,7 +12,9 @@
 @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
@@ -35,9 +37,6 @@ metacity
 #-man-pages-*
 #-words
 
-# use ssmtp
-ssmtp
-
 # save some space
 -autofs
 -acpid
@@ -50,10 +49,7 @@ ssmtp
 -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-soas-packages.ks

@@ -70,6 +70,5 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
--sugar-write
 
 %end