correct ostree repo location

see: https://pagure.io/fedora-kickstarts/pull-request/38#comment-8056

README

@@ -0,0 +1,23 @@
+The master branch is where development takes place:
+ - it may contain kickstart files that are broken, or
+ - spin concepts that are in the process of being
+   approved by the Board (trademark approval), or
+ - spin concepts that are in the process of being
+   approved by the Spins SIG
+
+The release specific branches contain spin concepts that:
+ - are approved (both by Board and Spin SIG)
+ - maintained for the remainder of the release cycle
+
+git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
+cd spin-kickstarts
+# If you need a specific branch other than master:
+git checkout BRANCHNAME
+# No tag has been added yet tag HEAD with
+git tag VERSION
+git push --tags
+make
+# Publish the released tar ball
+make publish
+# Clean up the generated files:
+make clean

README.md

@@ -1,31 +0,0 @@
-# fedora-kickstarts #
-
-This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
-
-The master branch is used by rawhide and each release branch is used by that release. 
-
-All changes should be made via the PR workflow. 
-
-This project is packaged in Fedora as the spin-kickstarts package allowing users to see 
-and modify the kickstart files for their local needs. 
-
-## To make a release ##
-
- * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
- * cd fedora-kickstarts
- * # If you need a specific branch other than master:
- * git checkout BRANCHNAME
- * # No tag has been added yet tag HEAD with
- * git tag VERSION
- * git push --tags
- * make
- * # Publish the released tar ball
- * make publish
- * # Clean up the generated files:
- * make clean
-
-# bug reports #
-
-Bugs should be reported to the spin-kickstarts bugzilla component:
-
-https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts

atomic-installer/lorax-configure-repo.tmpl

@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'\n%end\n"
 

fedora-aos.ks

@@ -9,6 +9,7 @@ selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
 
 # Uncomment the next line
 # to make the root password be thincrust
@@ -94,9 +95,5 @@ generic-logos
 #
 %post
 
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end
 

fedora-arm-base.ks

@@ -7,15 +7,14 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot --size=512 --fstype ext4
-part /boot --size=512 --fstype ext4 --asprimary
+part swap --size=512 --fstype swap
-part swap --size=512 --fstype swap --asprimary
+part / --size=3584 --fstype ext4
-part / --size=3584 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
+services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
 
 %include fedora-repo.ks
 
@@ -29,10 +28,9 @@ kernel
 dracut-config-generic
 # install tools needed to manage and boot arm systems
 @arm-tools
-rng-tools
+
 chrony
 extlinux-bootloader
-bcm283x-firmware
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
@@ -41,26 +39,13 @@ initial-setup-gui
 # remove this in %post
 dracut-config-generic
 
+
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
-
-# workaround for consequence of RHBZ #1324623: without this, with
-# yum-based creation tools, compose fails due to conflict between
-# libcrypt and libcrypt-nss. dnf does not seem to have the same
-# issue, so this may be dropped when appliance-creator is ported
-# to dnf.
-libcrypt-nss
--libcrypt
 %end
 
 %post
 
-# Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
-
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -81,13 +66,5 @@ systemctl mask tmp.mount
 
 dnf -y remove dracut-config-generic
 
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end
 

fedora-arm-kde.ks

@@ -5,5 +5,8 @@
 part / --size=5632 --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

fedora-arm-lxde.ks

@@ -3,5 +3,8 @@
 %include fedora-lxde-packages.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

fedora-arm-mate.ks

@@ -5,5 +5,8 @@
 part / --size=5500 --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

fedora-arm-minimal.ks

@@ -1,5 +1,6 @@
 %include fedora-arm-base.ks
 
+part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1279 --fstype ext4
 

fedora-arm-soas.ks

@@ -3,5 +3,8 @@
 %include fedora-soas-packages.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

fedora-arm-workstation.ks

@@ -10,8 +10,3 @@ part / --size=5500 --fstype ext4
 
 %end
 
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end

fedora-arm-xbase.ks

@@ -6,11 +6,3 @@
 @printing
 %end
 
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
-
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end

fedora-arm-xfce.ks

@@ -5,5 +5,8 @@
 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

fedora-atomic.ks

@@ -18,10 +18,11 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -32,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/25/ --ref=fedora-atomic/25/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/24/ --ref=fedora-atomic/24/x86_64/docker-host
 
 reboot
 
 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -121,15 +122,8 @@ 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.)"
 
-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
 echo "Adding Developer Mode GRUB2 menu item."
 /usr/libexec/atomic-devmode/bootentry add
 
-# enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 %end
 

fedora-cloud-atomic-pxetolive.ks

@@ -14,7 +14,7 @@ network --bootproto=dhcp --device=link --activate
 part / --fstype="ext4" --size=6000
 part /boot --size=500 --fstype="ext4"
 shutdown
-services --disabled=docker-storage-setup
+services --disabled=docker-storage-setup,network
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
  
 ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
@@ -28,9 +28,4 @@ userdel -r none
 # We copy content of separate /boot partition to root part when building live squashfs image,
 # and we don't want systemd to try to mount it when pxe booting
 cat /dev/null > /etc/fstab
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 %end

fedora-cloud-base.ks

@@ -39,17 +39,11 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-#
+part / --fstype ext4 --grow
-# We need to disable 64bit options here or extlinux won't work.
-# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
-# and
-# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
-#
-part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
 
 %include fedora-repo.ks
 
@@ -253,6 +247,7 @@ rm -f /var/lib/rpm/__db*
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 
+
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
@@ -270,13 +265,5 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 # For trac ticket https://fedorahosted.org/cloud/ticket/128
 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end
 

fedora-cloud-bigdata.ks

@@ -26,7 +26,7 @@ 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=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -219,9 +219,5 @@ 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.)"
 
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end
 

fedora-cloud-experimental.ks

@@ -17,7 +17,7 @@ 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=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -211,9 +211,5 @@ 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.)"
 
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end
 

fedora-docker-base.ks

@@ -43,9 +43,6 @@ sssd-client
 %end
 
 %post --log=/tmp/anaconda-post.log
-
-set -e
-
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros
 
@@ -71,7 +68,6 @@ releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
-echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /usr/lib/locale/locale-archive
 
 #Setup locale properly
@@ -80,6 +76,10 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*
 
+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
+
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 
@@ -87,8 +87,6 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
 umount /run
 systemd-tmpfiles --create --boot
 
-# Remove machine-id on pre generated images
 rm -f /etc/machine-id
-touch /etc/machine-id
 
 %end

fedora-live-astronomy_kde.ks

@@ -66,27 +66,16 @@ python3-ipython-notebook
 python3-sympy
 python3-networkx
 python3-pandas
-python3-pillow
-python3-seaborn
-python3-statsmodels
-python3-scikit-learn
-python3-scikit-image
 # Python 3 astronomy
-astropy-tools
-ginga
 python3-astropy
 python3-astroML
 python3-astroML-addons
 python3-astroquery
-python3-astroscrappy
 python3-APLpy
 python3-ATpy
 python3-ccdproc
-python3-fitsio
 python3-gatspy
 python3-photutils
-python3-pyvo
-python3-reproject
 python3-sep
 
 # matplotlib backends

fedora-live-base.ks

@@ -17,7 +17,7 @@ xconfig --startxonboot
 zerombr
 clearpart --all
 part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 network --bootproto=dhcp --device=link --activate
 shutdown
 
@@ -214,9 +214,7 @@ touch /.liveimg-configured
 
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
-# the hostname must be something else than 'localhost'
+echo "localhost" > /etc/hostname
-# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost-live" > /etc/hostname
 
 EOF
 
@@ -323,14 +321,6 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \
 # See bug 1317709
 rm -f /boot/*-rescue*
 
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end
 
 
@@ -342,5 +332,4 @@ if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
   if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
   cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
-
 %end

fedora-live-design_suite.ks

@@ -16,34 +16,6 @@ part / --size 14336
 # Switch to groups for design suite
 @design-suite
 
-# Added addons to address rhbz#1336879 from dnf
-gimp-data-extras
-gimp-dbp
-gimp-dds-plugin
-gimp-elsamuko
-gimp-fourier-plugin
-gimp-gap
-gimp-help
-gimp-help-browser
-gimp-high-pass-filter
-gimp-layer-via-copy-cut
-gimp-lensfun
-gimp-lqr-plugin
-gimp-normalmap
-gimp-paint-studio
-gimp-resynthesizer
-gimp-save-for-web
-gimp-separate+
-gimp-wavelet-denoise-plugin
-gimpfx-foundry
-gmic-gimp
-inkscape-psd
-inkscape-sozi
-LuxRender-blender
-sane-backends-drivers-scanners
-xsane-gimp
-#YafaRay-blender
-
 # Preview Gnome Photos
 gnome-photos
 
@@ -67,7 +39,7 @@ f24-backgrounds-extras-gnome
 #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', 'shotwell.desktop', 'darktable.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', 'gnome-photos.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials

fedora-live-games.ks

@@ -45,14 +45,14 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-freedroidrpg
+# freedroidrpg cut for size
 frozen-bubble
 gl-117
 glob2
 lincity-ng
 tmw
-#maniadrive - maniadrive isn't building with php7
+maniadrive
-#maniadrive-music
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
@@ -60,13 +60,13 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-# supertux # Crashing
+supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-warmux
+# warmux - Cut for size
 xmoto
 
 # traditional (small)

fedora-live-jam_kde.ks

@@ -108,6 +108,7 @@ ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
+lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins

fedora-live-kde.ks

@@ -30,7 +30,7 @@ part / --size=6144
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
-mediawriter
+liveusb-creator
 
 # only include kdegames-minimal
 -kdegames

fedora-live-scientific_kde.ks

@@ -133,9 +133,9 @@ backintime-kde
 libotf
 
 #root
-#root
+root
-#root-gui-fitpanel
+root-gui-fitpanel
-#root-python
+root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-live-workstation.ks

@@ -4,11 +4,7 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
-#
+%include snippets/packagekit-cached-metadata.ks
-# Disable this for now to see if packagekit is causing
-# compose failures by leaving a gpg-agent around holding /dev/null open.
-#
-#include snippets/packagekit-cached-metadata.ks
 
 part / --size 6656
 

fedora-mate-packages.ks

@@ -23,8 +23,8 @@ caja-actions
 mate-disk-usage-analyzer
 
 # more backgrounds
-f25-backgrounds-base
+f24-backgrounds-base
-f25-backgrounds-mate
+f24-backgrounds-mate
 f24-backgrounds-extras-base
 
 # system tools