atomic: switch to build from updates ref

We build from the updates ref and set the system to upgrade from
the prod ref.

fedora-arm-base.ks

@@ -30,6 +30,7 @@ dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
 @arm-tools
+-uboot-images-armv8
 rng-tools
 chrony
 extlinux-bootloader
@@ -39,6 +40,8 @@ initial-setup-gui
 -iwl*
 -ipw*
 -trousers-lib
+-usb_modeswitch
+-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot
 

fedora-arm-lxqt.ks

@@ -2,6 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
+part / --size=3800 --fstype ext4 --asprimary
+
 %packages
 # trojita not available on non-x86 platforms
 -trojita

fedora-arm-minimal.ks

@@ -4,3 +4,7 @@
 part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1256 --fstype ext4
+
+%packages
+-xkeyboard-config
+%end

fedora-arm-soas.ks

@@ -2,6 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-common.ks
 
+part / --size=3300 --fstype ext4 --asprimary
+
 %post
 
 %end

fedora-atomic.ks

@@ -17,32 +17,57 @@ rootpw --lock --iscrypted locked
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
+# console=ttyAMA0 and console=hvc0 as kernel boot parameter to see
+# kernel boot messages on serial console as well on aarch64 and
+# ppc64le respectively.
+# https://pagure.io/atomic-wg/issue/347
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 console=ttyAMA0 console=hvc0 net.ifnames=0"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-# Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
+# Implement: https://pagure.io/atomic-wg/issue/281
+# The bare metal layout default is in http://pkgs.fedoraproject.org/cgit/rpms/fedora-productimg-atomic.git
+# However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora).  So the
+# "15GB, rest unallocated" model doesn't make sense.  The Vagrant box is 40GB (apparently a number of
+# Vagrant boxes come big and rely on thin provisioning).
+# In both cases, it's simplest to just fill all the disk space.
+#
+# Use reqpart to create hardware platform specific partitions
+# https://pagure.io/atomic-wg/issue/299
+reqpart --add-boot
 part pv.01 --grow
 volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+# Start from 3GB as we did before, since we just need a size.  But we do --grow to fill all space.
+logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora/rawhide/x86_64/atomic-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/27/ --ref=fedora/27/${basearch}/updates/atomic-host
 
 reboot
 
 %post --erroronfail
-# See https://github.com/projectatomic/rpm-ostree/issues/42
-# Set the ostree repo to the location we want users to upgrade from
-# This location is where the compose gets synced to after the compose
-# is done.
+# Find the architecture we are on
+arch=$(uname -m)
+
+# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/27/ "fedora/27/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/27/${arch}/updates/atomic-host" --create "fedora-atomic:fedora/27/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/27/${arch}/updates/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-27-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/rawhide/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-27-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/27/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -52,8 +77,10 @@ passwd -l root
 cp /etc/skel/.bash* /var/roothome
 
 # Configure docker-storage-setup to resize the partition table on boot
-# https://github.com/projectatomic/docker-storage-setup/pull/25
+# and extend the root filesystem to fill it.
+# https://pagure.io/atomic-wg/issue/343
 echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
+echo 'ROOT_SIZE=+100%FREE' >> /etc/sysconfig/docker-storage-setup
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't

fedora-disk-base.ks

@@ -19,7 +19,7 @@ network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1
 
 zerombr
 clearpart --all --initlabel --disklabel=msdos
@@ -40,15 +40,16 @@ dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
 @arm-tools
+-uboot-images-armv7
 rng-tools
 chrony
 bcm283x-firmware
-uboot-images-armv8
--uboot-images-armv7
 initial-setup
 -iwl*
 -ipw*
 -trousers-lib
+-usb_modeswitch
+-iproute-tc
 -generic-release*
 
 # make sure all the locales are available for inital0-setup and anaconda to work
@@ -80,6 +81,9 @@ rm -f /var/lib/rpm/__db*
 # remove random seed, the newly installed instance should make it's own
 rm -f /var/lib/systemd/random-seed
 
+# The enp1s0 interface is a left over from the imagefactory install, clean this up
+rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
+
 dnf -y remove dracut-config-generic
 
 # Disable network service here, as doing it in the services line

fedora-disk-minimal.ks

@@ -4,3 +4,7 @@
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
 autopart --type=plain
+
+%packages
+-xkeyboard-config
+%end

fedora-kde-common.ks

@@ -61,9 +61,6 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 -ibus*
 -iok
 
-# save some space (from @standard)
--make
-
 # admin-tools
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around

fedora-live-astronomy_kde.ks

@@ -24,7 +24,13 @@ part / --size 14500
 # Installing the default/mandatory packages from engineering & scientific
 @engineering-and-scientific
 
+# Basic development
+@development-tools
+@c-development
+
 # astronomical data analysis
+astrometry
+astrometry-tycho2
 cdsclient
 fpack
 gcx
@@ -37,7 +43,7 @@ skyviewer
 swarp
 wcstools
 
-# Observatory: KStars + INDI drivers + Skychart
+# Observatory: KStars + INDI drivers
 indi-aagcloudwatcher
 indi-apogee
 indi-eqmod
@@ -45,10 +51,10 @@ indi-gphoto
 indi-sx
 indistarter
 kstars
-stellarium
 
 # misc. astronomy
 celestia
+stellarium
 virtualplanet
 
 # Some astro environment stuff

fedora-live-scientific_kde.ks

@@ -90,11 +90,13 @@ julia-doc
 
 # IDEs for the IDE folks
 @eclipse
-spyder
+#spyder
 
 #writing & publishing
-emacs
-emacs-color-theme
+# https://bugzilla.redhat.com/show_bug.cgi?id=1506888
+#emacs
+#emacs-color-theme
+
 vim
 scribus
 #scite

fedora-mate-common.ks

@@ -1,6 +1,5 @@
 %packages
 -PackageKit*                # we switched to dnfdragora, so we don't need this
-PackageKit-command-not-found  # nifty for installing not-found cli-commands
 firefox
 @mate
 compiz
@@ -31,7 +30,7 @@ lightdm-gtk-greeter-settings
 # audio video
 parole
 exaile
-gstreamer1-plugin-mpg123  # mp3 support
+gstreamer1-plugins-ugly-free # mp3 support
 
 # blacklist applications which breaks mate-desktop
 -audacious
@@ -55,13 +54,9 @@ nss-mdns
 -brasero
 -colord
 -fedora-icon-theme
--GConf2
--gnome-bluetooth-libs
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-software
--gnome-themes
--gnome-themes-standard
 -gnome-user-docs
 
 -@mate-applications

fedora-modular-arm-server.ks

@@ -0,0 +1,27 @@
+%include fedora-arm-base.ks
+
+# server defaults to xfs for / so lets do so on arm also
+part / --size=2500 --fstype xfs
+
+%packages
+# install the default groups for the server evironment since installing the environment is not working
+@server-product
+@standard
+@headless-management
+@container-management
+@domain-client
+-initial-setup-gui
+-generic-release*
+fedora-modular-release
+%end
+
+%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 .
+
+%end
+

fedora-modular-container-base-minimal.ks

@@ -1,8 +1,8 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
 # This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 
-%include fedora-modular-docker-common.ks
+%include fedora-modular-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 microdnf
@@ -47,7 +47,7 @@ rm -rfv /var/cache/* /var/log/* /tmp/*
 set -eux
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
+# Fix /run/lock breakage since it's not tmpfs in container
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 # NOTE: run this in nochroot because "umount" does not exist in chroot

fedora-modular-container-base.ks

@@ -0,0 +1,38 @@
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
+# This base is a standard Fedora image with python3 and dnf
+
+%include fedora-modular-container-common.ks
+
+%packages --excludedocs --instLangs=en --nocore
+rootfiles
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
+vim-minimal
+dnf
+dnf-yum  # https://pagure.io/fesco/ticket/1312#comment:29
+sssd-client
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some extraneous files
+rm -rf /var/cache/dnf/*
+rm -rf /tmp/*
+
+#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
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in container
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+#
+# We ignore the return code of the systemd-tmpfiles command because
+# at this point we have already removed the /etc/machine-id and all
+# tmpfiles lines with %m in them will fail and cause a bad return
+# code. Example failure:
+#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
+#
+umount /run
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+
+%end

fedora-modular-container-common.ks

@@ -1,4 +1,4 @@
-# This is the common bits between Docker base images based on Modular Fedora.
+# This is the common bits between Container base images based on Modular Fedora.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
@@ -24,10 +24,10 @@ keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
-# boot partitions are irrelevant as the final docker image is a tarball
+# boot partitions are irrelevant as the final container image is a tarball
 zerombr
 clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+autopart --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore
 fedora-modular-release

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