re-generate fontconfig cache in %post to work around #1169979

soas: add some fonts
Remove stellarium from the games spin due to size
2025-12-09 08:30:30 +08:00 · 2014-12-02 15:03:12 -08:00 · 2014-12-02 00:25:46 +00:00 · 2014-11-28 17:24:50 -06:00 · 2014-11-28 12:41:42 -06:00 · 2014-11-27 23:04:35 -06:00
31 changed files with 186 additions and 211 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -23,6 +23,7 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
@standard
@hardware-support
@dial-up
+@fedora-release-nonproduct

 kernel

--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -7,6 +7,7 @@ part / --size=1400 --fstype ext4
 -@standard
 -@dial-up
 -initial-setup-gui
+-generic-release*
 %end

 %post
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -24,38 +24,21 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 zerombr
 clearpart --all
 # Atomic differs from cloud - we want LVM
-autopart
+part /boot --size=200 --fstype="ext4"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos

-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host

 reboot



 %post --erroronfail
-
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
-  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
-  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
-  echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
+# See https://github.com/projectatomic/rpm-ostree/issues/42
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/21/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -73,25 +56,6 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
-# this is installed by default but we don't need it in virt
-echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
-echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
-
 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.
@@ -149,16 +113,6 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed

-echo "Cleaning old yum repodata."
-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 -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
 rpm -qa
@@ -167,13 +121,12 @@ echo "-----------------------------------------------------------------------"
 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
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -183,3 +136,10 @@ echo "(Don't worry -- that out-of-space error was expected.)"

 %end

+%post --nochroot
+# Work around anaconda/dracut/lvm bug
+sync
+sync
+sync
+systemctl reboot -f -f
+%end
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -37,6 +37,8 @@ part / --size 3000 --fstype ext4
 reboot

 # Package list.
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
 %packages --instLangs=en

 kernel-core
@@ -100,11 +102,6 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 yum -C -y remove linux-firmware
@@ -119,6 +116,18 @@ yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
 echo "Removing authconfig."
 yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"

+# instlang hack. (Note! See bug referenced above package list)
+find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+
 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.
@@ -194,6 +203,14 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*


+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -98,11 +98,6 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 yum -C -y remove linux-firmware
@@ -192,6 +187,14 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*


+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # 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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -56,6 +56,9 @@ dracut-*

 # Things needed for installation
@anaconda-tools
+fedora-productimg-cloud
+-fedora-productimg-server
+-fedora-productimg-workstation

 # Packages to enable server images to run in cloud environments
@cloud-server
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -16,18 +16,22 @@
 # 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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # 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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
 # @base got renamed to @standard, but @base is still included by default by pungi.
 %packages --default

+-fedora-productimg-cloud
+fedora-productimg-server
+-fedora-productimg-workstation
+
 # pungi is an inclusive depsolver so that multiple packages are brought 
 # in to satisify dependencies and we don't always want that. So we  use
 # an exclusion list to cut out things we don't want
@@ -123,6 +127,7 @@ dracut-*

 # Things needed for installation
@anaconda-tools
+fedora-productimg-server

 # Langpacks
 autocorr-*
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 # 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-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 %include fedora-workstation-packages.ks

@@ -44,5 +44,8 @@ kernel*

 # Things needed for installation
@anaconda-tools
+-fedora-productimg-cloud
+-fedora-productimg-server
+fedora-productimg-workstation

 %end
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -2,6 +2,7 @@
@kde-apps
@kde-desktop
@kde-media
+@kde-office
@kde-telepathy
@networkmanager-submodules

--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
@guest-desktop-agents
@standard
@core
+@fedora-release-nonproduct
@fonts
@input-methods
@dial-up
@@ -298,6 +299,12 @@ rm -f /core*
 # convince readahead not to collect
 # FIXME: for systemd

+# forcibly regenerate fontconfig cache (so long as this live image has
+# fontconfig) - see #1169979
+if [ -x /usr/bin/fc-cache ] ; then
+   fc-cache -f
+fi
+
 %end


--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -73,27 +73,6 @@ overpass-fonts
 -gnome-photos
 -rdesktop

-# Legacy cmdline things we don't want
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-quota
-minicom
-dos2unix
-finger
-ftp
-jwhois
-mtr
-pinfo
-rsh
-telnet
-nfs-utils
-ypbind
-yp-tools
-rpcbind
-acpid
-ntsysv
-
 %end

 %post
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -40,11 +40,16 @@ 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
-
-# set up user liveuser as default user and preselected user
-sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
-sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=kde-plasma.desktop
+SDDM_EOF
+fi

 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -2,7 +2,7 @@
 #
 # Description:
 # - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default 1 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -22,35 +22,14 @@ kde-wallpapers

 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
-calligra
 #kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)

 # kdeedu apps
-blinken
-kalzium
-kanagram
-kgeography
-khangman
-kiten
-klettres
-ktouch
-kturtle
-kwordquiz
-parley
-step
-marble
-kstars
-kalgebra
-kbruch
-kig
-kmplot
-rocs
-cantor
+@kde-education

 # Cantor backends
 cantor-R		# Cantor R backend, built against R-core at compile time
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -19,9 +19,6 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

-# temporarily fix for theme issue with anaconda rhbz (#1136994)
-sed -i "s/^gtk-theme='BlueMenta'/gtk-theme='Adwaita'/" /usr/share/glib-2.0/schemas/mate-fedora.gschema.override
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -43,6 +43,11 @@ FOE
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
  fi
+
+  # Copy Anaconda branding in place
+  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
+    cp -a /usr/share/lorax/product/* /
+  fi
 fi

 # rebuild schema cache with any overrides we installed
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -19,7 +19,6 @@ part / --size=4096
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
-scribus			# scribus is too big for the live images
 -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)
@@ -28,14 +27,9 @@ part / --size=4096
 #-kdeplasma-addons		# ~16 megs
 #-krusader			# ~4 megs

-# Additional packages that are not default in kde-desktop but useful
+# Additional packages that are not default in kde-* groups, but useful
 k3b				# ~15 megs
-calligra			# don't include whole calligra, just parts of it
-calligra-words
-calligra-sheets			# ~1 megs
-calligra-stage			# ~3 megs
 #kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
 fuse
 liveusb-creator

@@ -47,7 +41,6 @@ kdegames-minimal

 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts			# a compact CJK font, to replace:
-nhn-nanum-gothic-fonts			# Korean (old name, still in comps)
 -naver-nanum-gothic-fonts		# Korean
 -vlgothic-fonts				# Japanese
 -adobe-source-han-sans-cn-fonts		# simplified Chinese
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -7,6 +7,20 @@
 %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
+
 # First, no office
 -planner

@@ -15,21 +29,38 @@
 -brasero
 -bluez
 -bluez-cups
+-colord
 -@dial-up
-dnf
+-espeak
+-fedora-icon-theme
+-GConf2
 -gnome-bluetooth-libs
+-gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-software
+-gnome-themes
 -gnome-user-docs
+-gstreamer1-plugins-good
+-gstreamer1-plugins-bad-free
+-gstreamer-plugins-good
+-gstreamer-plugins-bad-free
+-gstreamer-plugins-espeak
 -@guest-desktop-agents
 -@libreoffice
 -@mate-applications
 -mate-icon-theme-faenza
-transmission-gtk
+-NetworkManager-bluetooth
+-samba-client
+-ibus-chewing
+-libical
+-OpenEXR-libs

 # Drop oversized fonts that aren't needed
-cjkuni-uming-fonts
-wqy-zenhei-fonts
+-gnu-free-mono-fonts
+-gnu-free-fonts-common
+-gnu-free-serif-fonts
+-gnu-free-sans-fonts
+-stix-fonts

 # Drop the Java plugin
 -icedtea-web
@@ -38,10 +69,6 @@
 # Drop things that pull in perl
 -linux-atm

-# No printing
-foomatic-db-ppds
-foomatic
-
 # 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.
@@ -60,26 +87,18 @@
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
-quota
-nano
+
 -minicom
-dos2unix
-finger
-ftp
+
 -jwhois
 -mtr
 -pinfo
 -rsh
-nfs-utils
 -ypbind
 -yp-tools
-rpcbind
-acpid
 -ntsysv

 # Drop some system-config things
-system-config-language
-system-config-printer
 -system-config-rootpassword
 -system-config-services
 -policycoreutils-gui
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -76,13 +76,19 @@ sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.con
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf

 # Don't use the default system user (in SoaS liveuser) as nick name
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
-
 # Disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
 # Enable Sugar power management
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
+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
+/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
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -53,7 +53,7 @@ maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 pinball
 scorched3d
@@ -171,7 +171,6 @@ celestia
 childsplay
 gcompris
 planets
-stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2
--- a/fedora-livedvd-scientific_kde.ks
+++ b/fedora-livedvd-scientific_kde.ks
@@ -48,21 +48,26 @@ ddd
 valgrind

 #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 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

 # matplotlib backends
 python-matplotlib-qt4
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,5 +1,4 @@
 %packages
-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -ConsoleKit                 # ConsoleKit is deprecated
 -ConsoleKit-x11             # ConsoleKit is deprecated
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -8,7 +8,6 @@
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>

-
 %packages
 -@fonts
 -@dial-up
@@ -34,6 +33,14 @@
 -ibus*
 -hyperv-daemons

+# Add some extra fonts
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+madan-fonts
+aajohan-comfortaa-fonts
+sil-abyssinica-fonts
+vlgothic-fonts
+
 # == Core Sugar Platform ==
@sugar-desktop
 -sugar-ruler
--- a/fedora-workstation-packages.ks
+++ b/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

@@ -18,6 +19,9 @@
@printing
@workstation-product

+# Branding for the installer
+fedora-productimg-workstation
+
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -21,6 +21,9 @@

 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
+# Add some screensavers, people seem to like them
+# Note that blank is still default.
+xscreensaver-extras

 # save some space
 -autofs
@@ -30,32 +33,6 @@ gnome-keyring-pam
 -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
-gutenprint
-stix-fonts
-ibus-typing-booster
 -xfce4-sensors-plugin
-#-man-pages-*
-adobe-source-han-* # save 94MB
-rodent-icon-theme  # save 34MB
-skkdic             # save 25MB
-naver-nanum-gothic-fonts # save 14MB
-ibus-kkc
-ibus-libpinyin
-libpinyin-data
-libkkc-data
-# Drop some fonts for space
-vlgothic-fonts
-paratype-pt-sans-fonts
-jomolhari-fonts
-sil-abyssinca-fonts
-
-# drop some system-config things
-system-config-network
-system-config-rootpassword
-#-system-config-services
-policycoreutils-gui

 %end
--- a/l10n/fedora-live-workstation-de_CH.ks
+++ b/l10n/fedora-live-workstation-de_CH.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-de_CH.ks
+# fedora-live-workstation-de_CH.ks
 #
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang de_DE.UTF-8
 keyboard sg-latin1-nodeadkeys
--- a/l10n/fedora-live-workstation-de_DE.ks
+++ b/l10n/fedora-live-workstation-de_DE.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-de_DE.ks
+# fedora-live-workstation-de_DE.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys
--- a/l10n/fedora-live-workstation-fr_FR.ks
+++ b/l10n/fedora-live-workstation-fr_FR.ks
@@ -1,4 +1,4 @@
-# fedora-livecd-desktop-fr_FR.ks
+# fedora-live-workstation-fr_FR.ks
 #
 # Description:
 # - French Fedora Live Spin with the Gnome Desktop Environment
@@ -6,7 +6,7 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang fr_FR.UTF-8
 keyboard fr-latin9
--- a/l10n/fedora-live-workstation-nl_NL.ks
+++ b/l10n/fedora-live-workstation-nl_NL.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-nl_NL.ks
+# fedora-live-workstation-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang nl_NL.UTF-8
 keyboard us
--- a/l10n/fedora-live-workstation-pt_BR.ks
+++ b/l10n/fedora-live-workstation-pt_BR.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-pt_BR.ks
+# fedora-live-workstation-pt_BR.ks
 #
 # Maintainer(s):
 # - Igor Pires Soares <igor at projetofedora.org>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang pt_BR.UTF-8
 keyboard br-abnt2
--- a/l10n/fedora-live-workstation-pt_PT.ks
+++ b/l10n/fedora-live-workstation-pt_PT.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-pt_PT.ks
+# fedora-live-workstation-pt_PT.ks
 #
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang pt_PT.UTF-8
 keyboard pt-latin1
--- a/l10n/fedora-live-workstation-ru_RU.ks
+++ b/l10n/fedora-live-workstation-ru_RU.ks
@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-ru_RU.ks
+# fedora-live-workstation-ru_RU.ks
 #
 # Maintainer(s):
 # Sergey Mihailov <sergey.mihailov at gmail.com>

-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks

 lang ru_RU.UTF-8
 keyboard ru