atomic-vagrant: Mask cloud-init instead of using rm on /etc

Now that cloud-init is enabled in the systemd unit, that change
goes in /usr/lib...which we can't easily change.  There are
two potentially sane solutions:
 - Refactor the kickstarts here
 - Some support for systemd presets in kickstart files would
   allow us to have a later override here

SparkleShare.txt

@@ -0,0 +1,9 @@
+Congratulations, you've successfully created a SparkleShare repository!
+
+Any files you add or change in this folder will be automatically synced to 
+ssh://luya@git.fedorahosted.org/git/spin-kickstarts.git and everyone connected to it.
+
+SparkleShare is an Open Source software program that helps people collaborate and 
+share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/
+
+Have fun! :)

atomic-installer/lorax-configure-repo.tmpl

@@ -1,8 +0,0 @@
-## Lorax template to configure Anaconda to use the local OSTree
-## repository on disk.
-
-<%page args="ostree_osname, ostree_ref"/>
-append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
-append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
-

atomic-installer/lorax-embed-repo.tmpl

@@ -1,11 +0,0 @@
-## Lorax template to embed an OSTree repository into the installer.iso
-## and configure an interactive installer use to look for it.
-##
-## Note that we pull with depth=0 to only get *one* commit into the
-## ISO, because we obviously don't want the full history.
-
-<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
-runcmd mkdir -p ${workdir}/iso-graft/content/repo
-runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
-runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
-runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}

fedora-aos.ks

@@ -4,7 +4,7 @@
 lang C
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"

fedora-arm-base.ks

@@ -1,13 +1,13 @@
 lang en_US.UTF-8
 #keyboard us
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=300 --fstype ext3
+part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 
@@ -23,6 +23,7 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @standard
 @hardware-support
 @dial-up
+@fedora-release-nonproduct
 
 kernel
 

fedora-arm-minimal.ks

@@ -1,7 +1,7 @@
 %include fedora-arm-base.ks
 
-part swap --size=256 --fstype swap
-part / --size=1200 --fstype ext4
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
 
 %packages
 -@standard

fedora-arm-server.ks

@@ -1,9 +1,7 @@
 %include fedora-arm-base.ks
 
-# server defaults to xfs for / so lets do so on arm also
-part / --size=3000 --fstype xfs
-
 %packages
+-@fedora-release-nonproduct
 -@dial-up
 # install the default groups for the server evironment since installing the environment is not working
 @server-product

fedora-arm-xfce.ks

@@ -1,8 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-
-part / --size=4000 --fstype ext4
+part / --size=3500 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cinnamon-packages.ks

@@ -1,28 +0,0 @@
-# fedora-cinnamon-packages.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-
-# internet and multimedia
-pidgin
-hexchat
-transmission
-parole
-
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
-# save some space
--fedora-icon-theme
--PackageKit*                # we switched to yumex, so we don't need this
-
-%end

fedora-cloud-atomic-vagrant.ks

@@ -6,7 +6,6 @@
 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
 user --name=vagrant --password=vagrant
-rootpw vagrant
 
 %post --erroronfail
 

fedora-cloud-atomic.ks

@@ -1,17 +1,15 @@
-# Fedora Atomic is a cloud-focused spin implementing the Project
-# Atomic patterns.  Note that this replicates the same tree which can
-# now be installed on bare metal.
-
-# This image allocates most space to an LVM-managed thin pool
-# dedicated for Docker containers, and uses docker-storage-setup to
-# dynamically resize storage on boot.
+# Fedora Atomic is a cloud-focused spin implementing the Project Atomic
+# patterns. 
+#
+# RIGHT NOW, this is very like the traditional cloud image -- this is
+# just a starting point.
 
 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -21,8 +19,7 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --disabled=network
-services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -33,14 +30,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
 
 reboot
 
 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -48,10 +45,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
-# Configure docker-storage-setup to resize the partition table on boot
-# https://github.com/projectatomic/docker-storage-setup/pull/25
-echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
-
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
 # actually have the opportunity to login there. FIX.

fedora-cloud-base-vagrant.ks

@@ -1,61 +0,0 @@
-# Like the Cloud Base image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-cloud-base.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-# So, to be clear, this gaping security hole is an integral part of how
-# Vagrant works - These images are _not_ supposed to be run in any public-
-# Internet facing way - They are for use on developer setups, almost always
-# with NAT
-user --name=vagrant --password=vagrant
-
-# Suggestion from @purpleidea that most/many vagrant boxes also set root PW
-# to "vagrant" for ease of use.  Again, see comments above.
-rootpw vagrant
-
-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
-
-%packages
-# The default koji Vagrantfile configuration uses rsync to sync files between
-# the vagrant host and the guest.  It uses yum to verify that rsync is present
-# and/or install it if it is not.  It will fail without adding the yum compat
-# layer for dnf
-# TODO: Teach vagrant about dnf
-dnf-yum
-# rsync gets installed when the Vagrant box is first launched on the
-# users setup. This can actually take a bit of time.  Just fold it
-# in to the base box disk image
-rsync
-%end
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-systemctl mask cloud-init cloud-init-local cloud-config cloud-final
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-# Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
-mkdir -m 0700 -p /root/.ssh
-cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
-chmod 600 /root/.ssh/authorized_keys
-chown -R root:root /root/.ssh
-
-%end
-

fedora-cloud-base.ks

@@ -7,29 +7,16 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory.  See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
-# Once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
-#   tempfile=$(mktemp --suffix=.ks)
-#   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-#   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -43,7 +30,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
@@ -116,9 +103,8 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-#echo "Removing linux-firmware package."
-#dnf -C -y erase linux-firmware
+echo "Removing linux-firmware package."
+dnf -C -y erase linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
@@ -156,11 +142,9 @@ NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
 cat > /etc/sysconfig/network << EOF
 NETWORKING=yes
 NOZEROCONF=yes
-DEVTIMEOUT=10
 EOF
 
 # For cloud images, 'eth0' _is_ the predictable device name, since

fedora-cloud-bigdata.ks

@@ -16,7 +16,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none

fedora-cloud-experimental.ks

@@ -7,7 +7,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none

fedora-docker-base.ks

@@ -2,26 +2,14 @@
 #
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
-#
-###  Hacking on this image ###
-# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
-# but you can run imagefactory locally too.
-#
-# To do so, testing local changes, first you'll need a TDL file.  I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# 
-# Then, once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
-#
 
 cmdline
-bootloader --disabled
+bootloader --location=none
 timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
+rootpw --plaintext qweqwe
 
 keyboard us
+firewall --disable
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
@@ -33,8 +21,7 @@ bash
 fedora-release
 rootfiles
 vim-minimal
-dnf
-dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+yum
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
@@ -45,9 +32,6 @@ dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros
 
-# remove the user anaconda forces us to make
-userdel -r none
-
 LANG="en_US"
 echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
 

fedora-install-server.ks

@@ -81,7 +81,6 @@ dracut-*
 @headless-management
 @container-management
 @domain-client
-@server-hardware-support
 
 # Common server packages
 @mysql

fedora-live-astronomy_kde.ks

@@ -1,164 +0,0 @@
-#fedora-live-astronomy-kde.ks
-# With KDE Desktop
-
-# Fedora Astronomy: For astronomers and astrophysicists
-# Fedora-Astronomy aims to create a Fedora which has the generic
-# toolset for the astronomer
-#
-# Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
-#
-# Partly based on Scientific KDE Spin 
-#     https://fedoraproject.org/wiki/Scientific_Spin
-#
-
-# Maintainer: Christian Dersch <lupinix@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Lupinix
-
-%include fedora-live-kde.ks
-
-# The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 12288
-
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# astronomical data analysis
-cdsclient
-fpack
-gcx
-psfex
-saoimage
-scamp
-sextractor
-siril
-skyviewer
-swarp
-
-# Observatory: KStars + INDI drivers + Skychart
-indi-aagcloudwatcher
-indi-apogee
-indi-eqmod
-indi-gphoto
-indi-sx
-kstars
-skychart
-skychart-data-dso
-skychart-data-stars
-stellarium
-
-# misc. astronomy
-celestia
-xvarstar
-
-# Some astro environment stuff
-astronomy-bookmarks
-astronomy-menus
-astronomy-menus-toplevel
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-# for astronomy
-cfitsio-devel
-CCfits-devel
-libnova-devel
-wcslib-devel
-
-
-#python 2 tools/libraries not included from the groups
-python-tools
-python-ipython
-python-ipython-console
-python-ipython-notebook
-sympy
-python-networkx
-python-pandas
-# Python astronomy
-astropy-tools
-python-astropy
-python-astroML
-python-photutils
-python-sep
-pyephem
-APLpy
-ATpy
-
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-# Python 3 astronomy
-python3-astropy
-python3-astroML
-python3-APLpy
-python3-ATpy
-python3-photutils
-python3-sep
-
-# matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-qt5
-python-matplotlib-tk
-python3-matplotlib-qt4
-python3-matplotlib-qt5
-python3-matplotlib-tk
-
-
-# Python IDE very useful for scientific use
-spyder
-
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-gimp
-inkscape
-kst
-kst-docs
-kst-fits
-scidavis
-
-#Misc. Utils
-ImageMagick
-kate
-kate-plugins
-rlwrap
-screen
-
-# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
--kde-l10n-*
--calligra-l10n-*
-
-%end
-
-%post
-
-%end

fedora-live-base.ks

@@ -10,7 +10,7 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
 @guest-desktop-agents
 @standard
 @core
+@fedora-release-nonproduct
 @fonts
 @input-methods
 @dial-up
@@ -47,9 +48,6 @@ anaconda
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
 
-# Without this, initramfs generation during live image creation fails: #1242586
-dracut-live
-
 %end
 
 %post
@@ -196,9 +194,6 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
-sed -i 's/rtcsync//' /etc/chrony.conf
-
 # Mark things as configured
 touch /.liveimg-configured
 
@@ -310,9 +305,6 @@ if [ -x /usr/bin/fc-cache ] ; then
    fc-cache -f
 fi
 
-echo 'File created by kickstart. See systemd-update-done.service(8).' \
-    | tee /etc/.updated >/var/.updated
-
 %end
 
 

fedora-live-cinnamon.ks

@@ -1,55 +0,0 @@
-# fedora-live-cinnamon.ks
-#
-# Description:
-# - Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
-
-part / --size=6144
-
-%post
-# cinnamon configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/cinnamon-session
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-# exclude GNOME-specific menu items
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/fedora-release-notes.webapp.desktop
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/yelp.desktop
-
-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 Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
-
-%end
-
-

fedora-live-design_suite.ks

@@ -13,11 +13,14 @@
 part / --size 8192
 
 %packages
+
 # graphics
 blender
 LuxRender-blender
 YafaRay-blender
 bluefish 
+#cinepaint
+#cmyktool
 colord-extra-profiles
 darktable
 dia
@@ -107,9 +110,9 @@ chmod a+x /usr/share/applications/list-design-tutorials.desktop
 # Add information about Fedora Design Suite
 cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 [Desktop Entry]
-Name=Design Suite Info
-GenericName=About Design Suite
-Comment=Wiki page of Design Suite
+Name=About Design Team 
+GenericName=About Design Team 
+Comment=Wiki page of Design Team
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
@@ -120,8 +123,8 @@ chmod a+x /usr/share/applications/fedora-design-suite.desktop
 # Add information about Fedora Design Team
 cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 [Desktop Entry]
-Name=Design Team Info
-GenericName=About Design Team 
+Name=About Design Suite
+GenericName=About Design Suite Wiki Page
 Comment=Wiki page of Design Team
 Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application

fedora-live-jam_kde.ks

@@ -199,12 +199,12 @@ thunderbird
 %post
 
 #setup kickoff favorites
-/bin/mkdir -p /etc/skel/.config
+/bin/mkdir -p /etc/skel/.kde/share/config
 
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.config/kickoffrc
+cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF

fedora-live-kde-base.ks

@@ -13,16 +13,16 @@ DESKTOP="KDE"
 DISPLAYMANAGER="KDE"
 EOF
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="Adwaita"
+gtk-theme-name="oxygen-gtk"
 EOF
 mkdir -p /root/.config/gtk-3.0
 cat > /root/.config/gtk-3.0/settings.ini << EOF
 [Settings]
-gtk-theme-name = Adwaita
+gtk-theme-name = oxygen-gtk
 EOF
 
 # add initscript
@@ -52,10 +52,10 @@ SDDM_EOF
 fi
 
 # add liveinst.desktop to favorites menu
-mkdir -p /home/liveuser/.config/
-cat > /home/liveuser/.config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
@@ -80,13 +80,23 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable the update notifications of apper 
+cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
+[CheckUpdate]
+autoUpdate=0
+distroUpgrade=0
+interval=0
+APPER_EOF
+
+# Disable some kded modules
+# apperd: http://bugzilla.redhat.com/948099
+cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
+[Module-apperd]
+autoload=false
+KDEDRC_EOF
 
 # Disable baloo
-cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
+cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
@@ -97,10 +107,24 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukfileindexer]
+autostart=false
+NEPOMUK_EOF
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
 EOF
 
 %end

fedora-live-kde.ks

@@ -1,7 +1,8 @@
-# fedora-livecd-kde.ks
+# fedora-live-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -11,62 +12,33 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=6144
+part / --size=8192
 
 
 %packages
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
+# ship KDE wallpapers instead of GNOME ones
 -desktop-backgrounds-basic
--kdeaccessibility*
--kdeartwork-screensavers	# screensavers are not needed on live images
-#-ktorrent			# kget has also basic torrent features (~3 megs)
--digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
--kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
+kde-wallpapers
 
-# Additional packages that are not default in kde-* groups, but useful
+# Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
 liveusb-creator
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
-# only include kdegames-minimal
--kdegames
-kdegames-minimal
+# kdeedu apps
+@kde-education
 
-### space issues
+# Cantor backends
+cantor-R		# Cantor R backend, built against R-core at compile time
+maxima			# runtime dependency of the Cantor Maxima backend
+octave			# runtime dependency of the Cantor Octave backend
 
-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
--naver-nanum-gothic-fonts		# Korean
--vlgothic-fonts				# Japanese
--adobe-source-han-sans-cn-fonts		# simplified Chinese
--adobe-source-han-sans-twhk-fonts	# traditional Chinese
-
--paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
--@input-methods
--scim*
--m17n*
--ibus*
--iok
-
-# save some space (from @standard)
--make
-
-# admin-tools
--gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
--system-config-services
-# prefer/use kusers
--system-config-users
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*
 
 ## avoid serious bugs by omitting broken stuff
 

fedora-live-mate_compiz.ks

@@ -1,50 +1,11 @@
-# Desktop with customizations to fit in a CD (package removals, etc.)
 # Maintained by the Fedora Desktop SIG:
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
 %include fedora-mate-packages.ks
-%include fedora-live-minimization.ks
 
-part / --size 6144
-
-%packages
-
-# Drop things for size
--@3d-printing
--brasero
--colord
--fedora-icon-theme
--GConf2
--gnome-bluetooth-libs
--gnome-icon-theme
--gnome-icon-theme-symbolic
--gnome-software
--gnome-themes
--gnome-themes-standard
--gnome-user-docs
-
--@mate-applications
--mate-icon-theme-faenza
-
-# Drop oversized fonts that aren't needed
-
-# Drop things that pull in perl
-
-# Dictionaries are big
-# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
-# strong preference to giving it a go on #fedora-desktop.
-# also see http://bugzilla.gnome.org/681084
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
-
-# Legacy cmdline things we don't want
--telnet
-
-%end
+part / --size 4096 
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -79,7 +40,4 @@ chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 %end

fedora-livecd-kde.ks

@@ -0,0 +1,76 @@
+# fedora-livecd-kde.ks
+#
+# Description:
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+#
+# Maintainer(s):
+# - Sebastian Vahl <fedora@deadbabylon.de>
+# - Fedora KDE SIG, http://fedoraproject.org/wiki/SIGs/KDE, kde@lists.fedoraproject.org
+
+%include fedora-live-kde-base.ks
+%include fedora-live-minimization.ks
+
+# DVD payload
+part / --size=4096
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+-kdeartwork-screensavers	# screensavers are not needed on live images
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end
+
+%post
+%end

fedora-livecd-mate_compiz.ks

@@ -0,0 +1,77 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-mate_compiz.ks
+%include fedora-live-minimization.ks
+
+%packages
+
+# some apps from mate-applications
+caja-actions
+mate-disk-usage-analyzer
+mate-netspeed
+
+# system tools
+system-config-printer
+system-config-printer-applet
+
+# audio player
+audacious
+
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
+# First, no office
+#-planner
+
+# Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-colord
+-@dial-up
+-espeak
+-fedora-icon-theme
+-GConf2
+-gnome-bluetooth-libs
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-themes
+-gnome-themes-standard
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+-NetworkManager-bluetooth
+
+# Drop oversized fonts that aren't needed
+
+# Drop things that pull in perl
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end

fedora-livedvd-electronic_lab.ks

@@ -0,0 +1,59 @@
+# Description : Live DVD image for Fedora/Free Electronic Lab
+#
+# Maintainer(s):
+# - Chitlesh Goorah <chitlesh a fedoraproject.org>
+# - Thibault North  <tnorth   a fedoraproject.org>
+
+%include fedora-live-workstation.ks
+
+# DVD payload
+part / --size 10240
+
+%packages
+
+@electronic-lab
+
+# Support for the Milkymist hardware community
+@milkymist
+
+
+# Office
+dia
+vym
+libreoffice-writer
+libreoffice-calc
+libreoffice-impress
+#libreoffice-extendedPDF
+planner
+graphviz
+
+
+# debugging tools
+make
+gdb
+valgrind
+kdbg
+wireshark-gnome
+qemu
+
+
+# EDA/CAD department
+perl-Test-Pod
+perl-Test-Pod-Coverage
+
+
+# Removing unnecessary packages from the desktop spin
+-abiword
+-@games
+-gimp
+-gimp-libs
+-gimp-data-extras
+-kdebluetooth
+-kbluetooth
+-rdesktop
+
+%end
+
+%post
+
+%end

fedora-livedvd-games.ks

@@ -4,7 +4,7 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
-%include fedora-live-xfce.ks
+%include fedora-livecd-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 10240
@@ -33,7 +33,7 @@ asc
 asc-music
 astromenace
 beneath-a-steel-sky-cd
-boswars
+#boswars # currently not building
 btanks
 bzflag
 crossfire-client

fedora-livedvd-scientific_kde.ks

@@ -171,6 +171,10 @@ hevea
 #Include Mozilla Firefox
 firefox
 
+# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
+-kde-l10n-*
+-calligra-l10n-*
+
 %end
 
 %post

fedora-mate-packages.ks

@@ -1,4 +1,7 @@
 %packages
+-PackageKit*                # we switched to yumex, so we don't need this
+-ConsoleKit                 # ConsoleKit is deprecated
+-ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz
@@ -15,42 +18,13 @@ emerald-themes
 emerald
 fusion-icon
 fusion-icon-gtk
-@networkmanager-submodules
-blueman
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-mate-netspeed
-
-# more backgrounds
-f22-backgrounds-mate
-f21-backgrounds-extras-base
-f21-backgrounds-extras-mate
-
-# system tools
-system-config-printer
-system-config-printer-applet
-
-# audio video
-parole
-exaile
-PackageKit-gstreamer-plugin
-
-# office
 @libreoffice
-
-# dsl tools
-rp-pppoe
-
-# drop packages
--PackageKit*                # we switched to yumex, so we don't need this
-
-# blacklist applications which breaks mate-desktop
--audacious
+@networkmanager-submodules
 
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 
+# This one needs to be kicked out of @standard
+-smartmontools
 %end

fedora-virt-server.ks.in

@@ -0,0 +1,72 @@
+# Kickstart file to create a small "base" Fedora image install suitable
+# for use as e.g. an application server.
+# 
+# Maintainer: fedora-cloud-list@fedoraproject.org
+#
+# REQUIRED variables:
+#   @@PUBLIC_KEY@@ - ssh public key
+# 
+# You must search for all required variables and replace them.
+# Example usage:
+# sed -e s,@@PUBLIC_KEY@@,"$(cat ~/.ssh/authorized_keys)", fedora-virt-server.ks.in > my-fedora-server.ks
+
+lang C
+keyboard us
+timezone --utc GMT/Zulu
+auth --useshadow --enablemd5
+firewall --service=ssh
+bootloader --timeout=1 --append="acpi=force"
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+
+## IMPORTANT ##
+## EDIT HERE ##
+# ROOT PASSWORD:
+# Setting a root password is NOT RECOMMENDED, especially if your
+# server will be accessible to the public internet.  This is
+# because of the rise of automated ssh password guessing attacks.
+# You should instead (if you don't have one already)
+# generate a public ssh key:
+# http://sial.org/howto/openssh/publickey-auth/
+# 
+# See comment below in %post for authorizing your public
+# key for the root account.
+
+rootpw ""
+
+# However, if you choose instead to make a password,
+# you will need to replace the above line with one like
+# rootpw --iscrypted @@ROOT_PASSWORD_CRYPTED@@
+# If you do neither of these things, you will not be able to log
+# into your machine.
+
+clearpart --all --initlabel
+part / --size=550 --grow --fstype=ext4
+# You may change this if you don't want swap
+part swap --recommended
+
+%packages
+@standard
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+## EDIT HERE ##
+cd /root
+if ! test -d .ssh; then
+  mkdir --mode=700 .ssh
+fi
+cat >> .ssh/authorized_keys << END_AUTHORIZED_KEYS
+@@PUBLIC_KEY@@
+END_AUTHORIZED_KEYS
+chmod 600 .ssh/authorized_keys
+if -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
+  chcon -R -h -t home_ssh_t .ssh
+fi
+
+%end
+
+reboot

fedora-workstation-packages.ks

@@ -2,6 +2,7 @@
 
 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
+-@fedora-release-nonproduct
 -@input-methods
 -@standard
 
@@ -9,7 +10,6 @@
 # workstation-product-environment in comps
 @base-x
 @core
-@firefox
 @fonts
 @guest-desktop-agents
 @hardware-support