Move manipulation of machine-id above systemd-tmpfiles

For complicated reasons the systemd-tmpfiles call acutally
fails and causes the rest of the kspost to not get run. This
commit makes it the last thing to get run.

This has been fixed in future branches with a more complicated
set of patches:

- https://pagure.io/fedora-kickstarts/c/a4ae071
- https://pagure.io/fedora-kickstarts/c/f6ecdc3

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

fedora-atomic-vagrant.ks

@@ -23,7 +23,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
 
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS

fedora-atomic.ks

@@ -32,14 +32,23 @@ 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/25/ --ref=fedora-atomic/25/x86_64/updates/docker-host
 
 reboot
 
 %post --erroronfail
-# See https://github.com/projectatomic/rpm-ostree/issues/42
+# Set the ref we are tracking to the be fedora-atomic/25/x86_64/docker-host
-ostree remote delete fedora-atomic
+# one, which is what we are using for the two week releases. We want consumers
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
+# of this image to track the two week releases
+ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/25/ fedora-atomic/25/x86_64/docker-host
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --create fedora-atomic:fedora-atomic/25/x86_64/docker-host
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --delete
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -47,6 +56,9 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
+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
 echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
@@ -131,5 +143,10 @@ echo "Adding Developer Mode GRUB2 menu item."
 # fails due to RHBZ #1369794
 /sbin/chkconfig network off
 
-%end
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
 
+%end

fedora-cloud-base-vagrant.ks

@@ -42,7 +42,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
 
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS

fedora-cloud-base.ks

@@ -278,5 +278,11 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
 %end
 

fedora-docker-base.ks

@@ -30,6 +30,7 @@ reboot
 
 %packages --excludedocs --instLangs=en --nocore
 bash
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 fedora-release
 rootfiles
 vim-minimal
@@ -83,12 +84,12 @@ rm -f /tmp/ks-script*
 #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
 
-# Fix /run/lock breakage since it's not tmpfs in docker
-umount /run
-systemd-tmpfiles --create --boot
-
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+# Fix /run/lock breakage since it's not tmpfs in docker
+umount /run
+systemd-tmpfiles --create --boot
+
 %end

fedora-mate-packages.ks

@@ -25,7 +25,7 @@ mate-disk-usage-analyzer
 # more backgrounds
 f25-backgrounds-base
 f25-backgrounds-mate
-f24-backgrounds-extras-base
+f25-backgrounds-extras-base
 
 # system tools
 system-config-printer