making cloud images is easier if we include the base

we should no be able to exclude gimp-help
Revert "this breaks compose, need to revert" This reverts commit d6a2350a39.
2025-12-09 16:40:30 +08:00 · 2013-11-01 16:48:21 -05:00 · 2013-10-31 14:32:34 -05:00 · 2013-10-27 00:32:45 +02:00 · 2013-10-26 08:41:43 -05:00 · 2013-10-24 07:48:37 +02:00
50 changed files with 306 additions and 1230 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -7,10 +7,6 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux

-part /boot --size=512 --fstype ext3
-part swap --size=512 --fstype swap
-part / --size=3000 --fstype ext4
-
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig

@@ -25,14 +21,12 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
@dial-up

 kernel
-
-dracut-config-generic
+kernel-lpae

 chrony
 arm-boot-config
 extlinux-bootloader
 initial-setup
-initial-setup-gui
 #lets resize / on first boot
 dracut-modules-growroot

@@ -40,22 +34,20 @@ dracut-modules-growroot
 dracut-config-generic

 # install uboot images
-uboot-images-armv7
+uboot-beagle
+uboot-beaglebone
+uboot-origen
+uboot-panda
+uboot-smdkv310
+uboot-uevm
+uboot-wandboard_dl
+uboot-wandboard_solo
+uboot-wandboard_quad

 %end

 %post

-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=armhfp
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this LiveCD"
-rpm -qa
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
--- a/fedora-arm-desktop-vfat.ks
+++ b/fedora-arm-desktop-vfat.ks
@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+
--- a/fedora-arm-desktop.ks
+++ b/fedora-arm-desktop.ks
@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+
--- a/fedora-arm-kde-vfat.ks
+++ b/fedora-arm-kde-vfat.ks
@@ -0,0 +1,13 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-kde-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%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 .
+
+%end
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
+%include fedora-arm-partitioning.ks

 part / --size=4000 --fstype ext4

--- a/fedora-arm-lxde-vfat.ks
+++ b/fedora-arm-lxde-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-lxde-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%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 .
+
+%end
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxde-packages.ks
+%include fedora-arm-partitioning.ks

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate-vfat.ks
+++ b/fedora-arm-mate-vfat.ks
@@ -0,0 +1,13 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-mate-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=5000 --fstype ext4
+
+%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 .
+
+%end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks
+%include fedora-arm-partitioning.ks

 part / --size=5000 --fstype ext4

--- a/fedora-arm-minimal-vfat.ks
+++ b/fedora-arm-minimal-vfat.ks
@@ -0,0 +1,20 @@
+%include fedora-arm-base.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
+%end
+
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,14 +1,9 @@
 %include fedora-arm-base.ks
+%include fedora-arm-partitioning.ks

 part swap --size=128 --fstype swap
 part / --size=1400 --fstype ext4

-%packages
-@standard
-@dial-up
-initial-setup-gui
-%end
-
 %post

 # setup systemd to boot to the right runlevel
--- a/fedora-arm-partitioning.ks
+++ b/fedora-arm-partitioning.ks
@@ -0,0 +1,4 @@
+part /boot --size=512 --fstype ext3
+part swap --size=512 --fstype swap
+part / --size=3000 --fstype ext4
+
--- a/fedora-arm-soas-vfat.ks
+++ b/fedora-arm-soas-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-soas-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%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 .
+
+%end
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-soas-packages.ks
+%include fedora-arm-partitioning.ks

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-vfat-partitioning.ks
+++ b/fedora-arm-vfat-partitioning.ks
@@ -0,0 +1,4 @@
+part /boot/uboot --size=20 --fstype vfat
+part swap --size=512 --fstype swap
+part / --size=3400 --fstype ext4
+
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-packages.ks
-
-part / --size=5000 --fstype ext4
-
-%packages
-initial-setup
-initial-setup-gui
-
-%end
-
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@@ -6,3 +6,15 @@
@printing
 %end

+%post
+# X on arm does not detect the driver needed correctly so we need a snippet to set something
+# using fbdev as the lowest common denominator.
+
+cat > /etc/X11/xorg.conf.d/fbdev.conf <<EOF
+Section "Device"
+    Identifier  "Display"
+    Driver      "fbdev"
+EndSection
+EOF
+
+%end
--- a/fedora-arm-xfce-vfat.ks
+++ b/fedora-arm-xfce-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-xfce-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%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 .
+
+%end
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
+%include fedora-arm-partitioning.ks

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -1,232 +0,0 @@
-# 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 --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@core
-grubby
-
-
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
-dracut-config-rescue
-
-syslinux-extlinux 
-
-# Needed initially, but removed below.
-firewalld
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
-biosdevname
-plymouth
-NetworkManager
-iprutils
-kbd
-uboot-tools
-kernel
-grub2
-
-%end
-
-
-
-%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
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-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.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-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
-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
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -1,4 +1,4 @@
-# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# This is a basic Fedora 20 spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
@@ -11,7 +11,6 @@
 # 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.

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

-firewall --disabled
+# this is actually not used, but a static firewall
+# matching these rules is generated below.
+firewall --service=ssh

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final

-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --size 2048 --fstype ext4

 %include fedora-repo.ks

@@ -39,10 +40,6 @@ reboot

 # Package list.
 %packages
-
-fedora-release-cloud
-
-kernel-core
@core
 grubby

@@ -66,6 +63,10 @@ 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
@@ -76,9 +77,6 @@ rsync
 -NetworkManager
 -iprutils
 -kbd
-uboot-tools
-kernel
-grub2

 %end

@@ -97,8 +95,8 @@ 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 "\troot (hd0)" >> /boot/grub/grub.conf
+  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
  echo
 done
@@ -112,8 +110,6 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none

 # Kickstart specifies timeout in seconds; syslinux uses 10ths.
 # 0 means wait forever, so instead we'll go with 1.
@@ -139,6 +135,28 @@ 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."
@@ -161,7 +179,7 @@ EOF
 # For cloud images, 'eth0' _is_ the predictable device name, since
 # we don't want to be tied to specific virtual (!) hardware
 rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules

 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
@@ -169,7 +187,6 @@ DEVICE="eth0"
 BOOTPROTO="dhcp"
 ONBOOT="yes"
 TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
 EOF

 # generic localhost names
@@ -206,26 +223,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 -i)
-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
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -1,237 +0,0 @@
-# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
-# but tailored specifically for Big Data processing out-of-the-box.
-# Primarily, it builds on that image but adds extra packages, but over
-# time may have additional focus.
-#
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. Cloud-init
-# creates a user account named "fedora" with passwordless sudo access. The
-# root password is empty and locked by default.
-#
-# Note that unlike the standard F20 install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@core
-grubby
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
-dracut-config-rescue
-
-syslinux-extlinux 
-
-# Needed initially, but removed below.
-firewalld
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
-biosdevname
-plymouth
-NetworkManager
-iprutils
-kbd
-uboot-tools
-kernel
-grub2
-
-%end
-
-
-
-%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
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-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.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-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
-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
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -1,228 +0,0 @@
-# This is a spin of the Fedora cloud image designed for trying out new
-# images in rawhide. It won't be built for non-rawhide trees, let alone
-# actual releases.
-
-cmdline
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages --excludedocs --instLangs=en_US
-
-fedora-release-cloud
-
-kernel-core
-@core
-grubby
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
-dracut-config-rescue
-
-syslinux-extlinux 
-
-# Needed initially, but removed below.
-firewalld
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
-biosdevname
-plymouth
-NetworkManager
-iprutils
-kbd
-uboot-tools
-kernel
-grub2
-
-%end
-
-
-
-%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
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-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.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-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
-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
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
--- a/fedora-desktop-packages.ks
+++ b/fedora-desktop-packages.ks
@@ -2,7 +2,6 @@
@firefox
@gnome-desktop
@libreoffice
-@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.
@@ -21,4 +20,12 @@ 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
--- a/fedora-i386-cloud.ks
+++ b/fedora-i386-cloud.ks
@@ -0,0 +1,20 @@
+%include fedora-cloud-base.ks
+
+# Package list.
+%packages
+kernel-PAE
+
+%end
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-PAE
+EOF
+fi
+%end
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -1,99 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-kernel*debug*
-kernel-kdump*
-kernel-tools*
-syslog-ng*
-astronomy-bookmarks
-generic*
-GConf2-dbus*
-bluez-gnome
-# Periods cause problems in paterns, so replace with *s
-java-1*8*0-openjdk
-community-mysql*
-jruby*
-
-# core
-kernel*
-dracut-*
-
-# Desktops
-
-## common stuff
-@base-x
-@guest-desktop-agents
-@guest-agents
-@standard
-@core
-@dial-up
-@fonts
-@input-methods
-@multimedia
-@hardware-support
-@printing
-@admin-tools
-@basic-desktop
-
-
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@javaenterprise
-
-# Things needed for installation
-@anaconda-tools
-
-# Langpacks
-autocorr-*
-eclipse-nls-*
-hunspell-*
-hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
-man-pages-*
-mythes-*
-gimp-help-*
-
-# Removals
-PackageKit-zif
-zif
-%end
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -16,17 +16,17 @@
 # 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
+#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-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
+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)
 # @base got renamed to @standard, but @base is still included by default by pungi.
-%packages --default
+%packages --default --nobase

 # 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
@@ -124,7 +124,7 @@ dracut-*
@sql-server
@design-suite
 ## Not included yet due to space concerns
-#@javaenterprise
+#@jbossas
 #@milkymist
 #@mingw32
 #@ocaml
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -1,128 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-kernel*debug*
-kernel-kdump*
-kernel-tools*
-syslog-ng*
-astronomy-bookmarks
-generic-logos*
-generic-release*
-GConf2-dbus*
-bluez-gnome
-community-mysql*
-
-# core
-kernel*
-dracut-*
-
-# No desktops
-cinnamon*
-enlightenment*
-gnome-shell
-gnome-session
-kde*
-lightdm-kde
-lightdm-razorqt
-# Pulls in qt
-oprofile-gui
-
-@legacy-fonts
-
-
-## common stuff
-@guest-agents
-@standard
-@core
-@multimedia
-@hardware-support
-
-# Workstation
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-
-# Common server packages
-@mysql
-@sql-server
-@web-server
-
-# Web Server environment
-@haproxy
-@mongodb
-@perl-web
-@python-web
-@php
-@rubyonrails
-@tomcat
-
-# Infrastructure Server
-@directory-server
-@dogtag
-@dns-server
-@freeipa-server
-@ftp-server
-@mail-server
-@network-server
-@printing
-@smb-server
-@virtualization
-@load-balancer
-@ha
-
-@container-management
-@headless-management
-@javaenterprise
-
-# “uservisible” groups we want to offer
-@editors
-@network-server
-@system-tools
-@text-internet
-
-# Things needed for installation
-@anaconda-tools
-
-# Langpacks
-autocorr-*
-hunspell-*
-man-pages-*
-gimp-help-*
-
-# Removals
-PackageKit-zif
-zif
-%end
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -3,7 +3,6 @@
@kde-desktop
@kde-media
@kde-telepathy
-@networkmanager-submodules

 ### The KDE-Desktop

--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -193,7 +193,7 @@ systemctl stop mdmonitor.service 2> /dev/null || :
 systemctl stop mdmonitor-takeover.service 2> /dev/null || :

 # don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.software download-updates 'false' || :
+gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :

 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
@@ -280,8 +280,6 @@ 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' --whatprovides system-release)
-basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
@@ -303,7 +301,7 @@ rm -f /core*


 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL

 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
--- a/fedora-live-design-suite.ks
+++ b/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 <luya AT fedoraproject DOT org>
+# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas

 %include fedora-live-desktop.ks
@@ -27,12 +27,9 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
-gimp-gap
-gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
-gimp-separate+
 gpick
 GREYCstoration-gimp 
 hugin 
@@ -59,6 +56,10 @@ 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
@@ -100,28 +101,44 @@ 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']
 #Enable categories in Gnome Shell
-app-folder-categories=['Utilities', 'Games', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'wine-wine', 'Crossover', 'Crossover Games', 'Science', 'Education', 'Universal Access', 'Other']
+app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
 FOE

-# Add link to lists of tutorials
+# Add link to the Inkscape Course
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
+[Desktop Entry]
+Name=Introduction To Inkscape
+GenericName=Inkscape Course
+Comment=Materials from Máirín Duffy's Inkscape Class
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Type=Application
+Icon=fedora-logo-icon
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/inkscape-course.desktop
+
+<<<<<<< HEAD
+=======
+# Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
 Name=List of design tutorials
-GenericName=List of Tutorials for Designers
-Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://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

--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -12,9 +12,9 @@ cat >> /etc/rc.d/init.d/livesys << EOF


 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
 FOE

 # don't run gnome-initial-setup
--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@@ -76,7 +76,7 @@ sooperlooper

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

 #dssi
 nekobee-dssi
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -90,12 +90,6 @@ cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
 autoload=false
 KDEDRC_EOF

-# Disable baloo
-cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
-[Basic Settings]
-Indexing-Enabled=false
-BALOO_EOF
-
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -15,6 +15,11 @@
 -coolkey
 -wget

+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -1,69 +0,0 @@
-# Maintained by the Fedora Workstation WG:
-# http://fedoraproject.org/wiki/Workstation
-# mailto:desktop@lists.fedoraproject.org
-
-%include fedora-live-base.ks
-%include fedora-workstation-packages.ks
-
-part / --size 6144 
-
-%post
-
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-
-# disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
-FOE
-
-# don't run gnome-initial-setup
-mkdir ~liveuser/.config
-touch ~liveuser/.config/gnome-initial-setup-done
-
-# make the installer show up
-if [ -f /usr/share/applications/liveinst.desktop ]; then
-  # Show harddisk install in shell dash
-  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
-  # need to move it to anaconda.desktop to make shell happy
-  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
-
-  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
-[org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
-FOE
-
-  # Make the welcome screen show up
-  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
-    mkdir -p ~liveuser/.config/autostart
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
-  fi
-fi
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-# set up auto-login
-cat > /etc/gdm/custom.conf << FOE
-[daemon]
-AutomaticLoginEnable=True
-AutomaticLogin=liveuser
-FOE
-
-# Turn off PackageKit-command-not-found while uninstalled
-if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
-  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
-fi
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-
-EOF
-
-%end
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -25,6 +25,7 @@

 # Drop the Java plugin
 -icedtea-web
+-java-1.7.0-openjdk
 -java-1.8.0-openjdk

 # Drop things that pull in perl
@@ -79,6 +80,7 @@
 -dump

 # Drop some system-config things
+-system-config-boot
 -system-config-language
 -system-config-rootpassword
 -system-config-services
--- a/fedora-livecd-mate-compiz.ks
+++ b/fedora-livecd-mate-compiz.ks
@@ -11,33 +11,15 @@
 -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

 # Drop the Java plugin
 -icedtea-web
+-java-1.7.0-openjdk
 -java-1.8.0-openjdk

 # Drop things that pull in perl
@@ -83,8 +65,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
@@ -96,3 +78,4 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache

 %end
+
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -24,14 +24,15 @@ part / --size 10240
 %packages
@xfce-desktop
@xfce-apps
+#@xfce-extra-plugins
+#@xfce-media
+#@xfce-office
+#@firefox

-# Security tools
+# 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
@@ -40,16 +41,13 @@ 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
-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
@@ -76,6 +74,9 @@ gnome-keyring-pam
 -pads
 -pdfcrack
 -picviz-gui
+-prelude-lml
+-prelude-manager
+-prewikka
 -proxychains
 -pyrit
 -raddump
@@ -83,15 +84,13 @@ gnome-keyring-pam
 -safecopy
 -samdump2
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe

-# Is not available for OpenVAS-7. No longer supported by upstream.
-openvas-client 
-
 %end

 %post
--- a/fedora-livecd-soas.ks
+++ b/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 11 (Unknown)
-Fedora release 21 (Rawhide)
+Sugar on a Stick 10 (Unknown)
+Fedora release 20 (Rawhide)
 EOF

 # Add our activities to the favorites
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -91,7 +91,6 @@ lordsawar
 lure
 machineball
 nethack
-openlierox
 pachi
 pioneers
 quarry
@@ -150,7 +149,6 @@ pingus
 # puzzles (small)

 escape
-gbrainy
 magicor
 mirrormagic
 pipenightdreams
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@@ -78,6 +78,7 @@ firefox
 -ntsysv

 # Drop some system-config things
+-system-config-boot
 -system-config-language
 -system-config-network
 -system-config-rootpassword
@@ -102,9 +103,9 @@ disable-lock-screen=true
 FOE

 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
 FOE

 # make the installer show up
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -27,8 +27,8 @@ scilab-doc

 # sagemath
 # BZ #1006230 should fix this
-#sagemath
-#sagemath-notebook
+sagemath
+sagemath-notebook

 #Devel tools

--- a/fedora-lxde-packages.ks
+++ b/fedora-lxde-packages.ks
@@ -12,10 +12,7 @@
@lxde-apps
@lxde-media
@lxde-office
-@networkmanager-submodules
-
-# FIXME: can be omitted once comps is updated
-midori
+@firefox

 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -38,6 +35,9 @@ metacity
 #-man-pages-*
 #-words

+# use ssmtp
+ssmtp
+
 # save some space
 -autofs
 -acpid
@@ -50,9 +50,13 @@ 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
 #-system-config-language
 -system-config-network
 -system-config-rootpassword
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,8 +1,6 @@
 %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
 firefox
@mate
 compiz
@@ -21,7 +19,6 @@ emerald
 fusion-icon
 fusion-icon-gtk
@libreoffice
-@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.
--- a/fedora-repo.ks
+++ b/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
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -41,9 +41,6 @@ lightdm-gtk
 # enable for testing in the F17 dev cycle
@input-methods

-# Needed for wifi, bluetooth and WWAN connection support
-@networkmanager-submodules
-
 # == Platform Components ==
 # from http://wiki.sugarlabs.org/go/0.94/Platform_Components
 alsa-plugins-pulseaudio
@@ -73,5 +70,6 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
+-sugar-write

 %end
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -1,70 +0,0 @@
-%packages
-@firefox
-@gnome-desktop
-@libreoffice
-@networkmanager-submodules
-
-#QT
-qt
-qt-settings
-qt-x11
-qt5-qtbase
-qt5-qtbase-gui
-qt5-qtdeclarative
-qt5-qtxmlpatterns
-
-devassistant
-scl-utils
-
-# 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
-
-# We use gnome-control-center's printer and input sources panels instead
-system-config-printer
-im-chooser
-
-aisleriot
-baobab
-biosdevname
-coolkey
-deja-dup
-dtc
-dump
-ed
-finger
-ftp
-gc
-gfs2-utils
-gnu-free-fonts-common
-gnu-free-mono-fonts
-gnu-free-sans-fonts
-gnu-free-serif-fonts
-gtk2-immodule-xim
-gtk3-immodule-xim
-gtkmm24
-guile
-imsettings*
-irda-utils
-irqbalance
-isdn4k-utils
-kernel-modules-extra
-lftp
-linux-atm
-minicom
-nano
-ntsysv
-numactl
-reiserfs-utils
-rsh
-tagsoup
-talk
-telnet
-uboot-tools
-xl2tpd
-NetworkManager-l2tp
-
-%end
--- a/fedora-x86_64-cloud.ks
+++ b/fedora-x86_64-cloud.ks
@@ -0,0 +1,18 @@
+%include fedora-cloud-base.ks
+
+%packages
+kernel
+%end
+
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOF
+fi
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -12,7 +12,6 @@

 %packages

-@networkmanager-submodules
@xfce-desktop
@xfce-apps
@xfce-extra-plugins
@@ -39,6 +38,7 @@ gnome-keyring-pam
 #-man-pages-*

 # drop some system-config things
+-system-config-boot
 -system-config-network
 -system-config-rootpassword
 #-system-config-services
Author	SHA1	Message	Date
Dennis Gilmore	a26624ed9b	making cloud images is easier if we include the base	2013-11-01 16:48:21 -05:00
Dennis Gilmore	50d56638a4	we should no be able to exclude gimp-help Revert "this breaks compose, need to revert" This reverts commit `d6a2350a39`.	2013-10-31 14:32:34 -05:00
Kevin Kofler	f111c49a16	fedora-live*-kde.ks: Completely remove references to kaffeine. They were already commented out. Now that kaffeine is gone from Fedora, they are not going to come back.	2013-10-27 00:32:45 +02:00
Dennis Gilmore	75b3a92964	add cloud image kickstarts, pulled from the cloud-kickstart repo, we have different snippets per arch because they need different kernels	2013-10-26 08:41:43 -05:00
Brendan Jones	c69f0a4e2d	Jam: add new lv2 plugins, aj-snapshot	2013-10-24 07:48:37 +02:00
Peter Robinson	47b27db344	SoaS: drop write for the moment	2013-10-23 20:07:24 +01:00
Peter Robinson	8db08b9dc9	SoaS: add FotoToon	2013-10-23 17:36:06 +01:00
Adam Williamson	1021a05fd1	fix and simplify setting of firefox homepage in qa-test-day.ks	2013-10-22 09:14:47 -07:00
Bruno Wolff III	dcebd2c540	Use git version to get version name Using git version is simpler as it handles oddball cases internally. Since we have been using mostly lightweight tags I have set it to search those in addition to annotated tags for the best match. The output for commits that don't have a tag seems a bit nicer as well. Conflicts: Makefile	2013-10-18 15:17:25 -05:00
Dennis Gilmore	d22816d5ff	install dracut-config-generic on arm images to get a generic initramfs remove it in %post so updates get host only initramfs's	2013-10-16 21:58:04 -05:00
Kalev Lember	9b3251521f	Adapt for changed rpm gpg key names	2013-10-17 00:15:15 +02:00
Luya Tshimbalanga	41cdac9e94	fixed icon access for tutorials	2013-10-15 23:15:55 -07:00
Dennis Gilmore	d6a2350a39	this breaks compose, need to revert Revert "Drop gimp-help, b/c it's huge. (#1000891)" This reverts commit `779c417bcd`.	2013-10-13 23:20:55 -05:00
Matthias Clasen	aac93c046a	Desktop: drop prelink We're still oversize, and prelink is generally unloved.	2013-10-08 12:59:14 -04:00
Matthias Clasen	aeb2bf2034	desktop: drop gnome-boxes and gnome-dictionary We're oversize, and we have a nice application installer now. Having boxes no the spin causes some problems wrt to network configuration, anyway.	2013-10-08 12:55:42 -04:00
Rex Dieter	d94cd77007	kde: SDDM doesn't start (#1015048 )	2013-10-03 10:07:12 -05:00
Bill Nottingham	779c417bcd	Drop gimp-help, b/c it's huge. (#1000891 )	2013-10-03 10:50:26 -04:00
Amit Saha	c8dc4f13f5	Scientific: Increase install root size	2013-10-03 16:24:59 +10:00
Fabian Affolter	8011bf222f	increse part size same as in f21	2013-10-01 23:33:46 +02:00
Fabian Affolter	4ab5d14b10	remove more pkgs	2013-10-01 23:30:58 +02:00
Peter Robinson	37589abe3d	Merge branch 'f20' of ssh://git.fedorahosted.org/git/spin-kickstarts into f20	2013-09-25 01:08:48 +01:00
Peter Robinson	59142fcc92	SoaS: add lightdm as it's not pulled in by lightdm-gtk anymore it seems	2013-09-25 01:08:04 +01:00
Luya Tshimbalanga	e4975f4c09	design: fix link for tutorials Conflicts: fedora-live-design-suite.ks	2013-09-17 11:34:53 -07:00
Fabian Affolter	77f0bcbfd2	remove more pkgs to save space	2013-09-16 22:19:29 +02:00
Shakthi Kannan	02b55984ec	Increase FEL DVD payload size to 10240	2013-09-16 06:07:44 +05:30
Amit Saha	a29472b8c8	Scientific: Increase the part size	2013-09-12 17:28:23 +10:00
Kevin Fenzi	b6b2f1c8b1	Drop kbluetooth and rdesktop for now from e-lab to get things testable.	2013-09-11 09:48:23 -06:00
Amit Saha	f110c70651	Scientific: Add back sagemath. Fix: https://bugzilla.redhat.com/show_bug.cgi?id=1006230	2013-09-11 11:41:39 +10:00
Luya Tshimbalanga	359cf00301	design: temporarily remove rdesktop	2013-09-10 16:05:46 -07:00
Amit Saha	84f578fcfc	Scientific: including sage fails depcheck for no clear reason	2013-09-10 13:02:05 +10:00
Amit Saha	9d08686776	Scientific: Add sagemath	2013-09-09 09:39:57 +10:00
Amit Saha	a60ccfaea5	Scientific: firefox deps are now fixed	2013-09-06 15:21:31 +10:00
Peter Robinson	b8706aa425	SoaS: add lightdm-gtk	2013-09-05 23:23:33 +01:00
Peter Robinson	060a19dc48	update sugar	2013-09-05 23:18:41 +01:00
Amit Saha	3b11ed5a50	Scientific: Remove matplotlib's wx backend	2013-09-06 08:12:23 +10:00
Matthias Clasen	1afc133c89	desktop: we don't need uboot-tools on the desktop spin	2013-09-05 17:44:44 -04:00
Amit Saha	9a220d6fa2	Scientific: Add Python 3 packages. Disabling torque for now.	2013-09-05 17:06:11 +10:00
Brendan Jones	f0b7758285	Jam: add new non-* packages	2013-09-04 06:19:07 +02:00
Amit Saha	0458ba8098	Scientific: Include additional packages Disable firefox for now.	2013-09-03 13:06:12 +10:00
Kevin Kofler	f573b2905b	fedora-live-kde-base.ks: fix #1003619 (SDDM autologin) Set SDDM rather than KDM to autologin liveuser on the KDE live image. Patch by Martin Bříza.	2013-09-02 22:47:24 +02:00
Matthias Clasen	b8dca705d6	desktop: Remove a few apps Remove apps that are being presented as 'featured' in gnome-softwared.	2013-09-02 12:55:12 -04:00
Bruno Wolff III	13a77ad28b	Add missing 'f' to updates and testing repo urls	2013-08-31 08:09:27 -05:00
Luya Tshimbalanga	96b509716f	design: fixes group	2013-08-30 11:51:02 -07:00
Dennis Gilmore	7e9439c5f0	make / bigger on KDE images	2013-08-28 20:27:31 -05:00
Adam Williamson	802966ff92	add workaround for #679486 from kparal (see comment #86 )	2013-08-28 09:29:06 -05:00
Dennis Gilmore	e10a135b4d	setup extlinux bootloader on arm images	2013-08-26 23:11:14 -05:00
Dennis Gilmore	69cd14ecc8	increase the size of the / partitions for Desktop and Mate images	2013-08-26 20:56:30 -05:00
Dennis Gilmore	3edb2534c5	target 2gb for minimal images so they can be installed into beaglebone black nand	2013-08-26 17:18:27 -05:00
Kevin Kofler	f340f0eddf	fedora-livecd-kde.ks: Bump payload size. Also update the comments at the top of fedora-live-kde.ks and fedora-livecd-kde.ks, it's been ages since "livecd-kde" last fit on an actual CD, the target size is 1 GiB now.	2013-08-26 16:17:54 +02:00
Adam Williamson	d356510dc3	make fedora-repo.ks consistent with the actual filename	2013-08-21 16:51:19 -07:00
Bruno Wolff III	6ac1f99024	Switch over repos for branch	2013-08-20 21:31:04 -05:00