atomic-vagrant: Mask cloud-init instead of using rm on /etc

Now that cloud-init is enabled in the systemd unit, that change
goes in /usr/lib...which we can't easily change.  There are
two potentially sane solutions:
 - Refactor the kickstarts here
 - Some support for systemd presets in kickstart files would
   allow us to have a later override here

fedora-arm-server.ks

@@ -0,0 +1,29 @@
+%include fedora-arm-base.ks
+
+%packages
+-@fedora-release-nonproduct
+-@dial-up
+# 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*
+%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 .
+
+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
+

fedora-arm-xfce.ks

@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
+part / --size=3500 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cloud-atomic-pxetolive.ks

@@ -0,0 +1,31 @@
+# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
+# https://fedoraproject.org/wiki/Changes/AtomicHost
+
+lang en_US.UTF-8
+keyboard us
+timezone America/New_York
+zerombr
+clearpart --all --initlabel
+rootpw --lock --iscrypted locked
+user --name=none
+bootloader --timeout=1
+network --bootproto=dhcp --device=link --activate
+# We are only able to install atomic with separate /boot partition currently
+part / --fstype="ext4" --size=6000
+part /boot --size=500 --fstype="ext4"
+shutdown
+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
+ 
+%post
+
+# Ensure the root password is locked, we use cloud-init
+passwd -l root
+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
+%end

fedora-cloud-atomic-vagrant.ks

@@ -0,0 +1,28 @@
+# Like the Atomic cloud image, but tuned for vagrant.  Enable
+# the vagrant user, disable cloud-init.
+
+%include fedora-cloud-atomic.ks
+
+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
+
+user --name=vagrant --password=vagrant
+
+%post --erroronfail
+
+# Work around cloud-init being both disabled and enabled; need
+# to refactor to a common base.
+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
+sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
+mkdir -m 0700 -p ~vagrant/.ssh
+cat > ~vagrant/.ssh/authorized_keys << EOKEYS
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOKEYS
+chmod 600 ~vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant ~vagrant/.ssh/
+
+%end
+

fedora-cloud-atomic.ks

@@ -30,14 +30,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=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299

fedora-install-cloud.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)

fedora-install-server.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -72,13 +72,6 @@ dracut-*
 @core
 @hardware-support
 
-# Some development tools
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-
 # Fedora Server.
 # Including this causes the fedora-release-server package to be included,
 # which in turn enables server-product-environment, and due to to its priority

fedora-install-workstation.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
 
 %include fedora-workstation-packages.ks
 

fedora-live-base.ks

@@ -14,7 +14,7 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-part / --size 3072 --fstype ext4
+part / --size 4096 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks

fedora-live-design_suite.ks

@@ -75,7 +75,7 @@ aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
 campivisivi-titillium-fonts
 lato-fonts
-opens-sans-fonts
+open-sans-fonts
 overpass-fonts
 
 # removal of unneeded applications
@@ -107,10 +107,34 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
+# Add information about Fedora Design Suite
+cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
+[Desktop Entry]
+Name=About Design Team 
+GenericName=About Design Team 
+Comment=Wiki page of Design Team
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
+Type=Application
+Icon=applications-internet
+Categories=Documentation;
+FOE
+chmod a+x /usr/share/applications/fedora-design-suite.desktop
+
+# Add information about Fedora Design Team
+cat >> /usr/share/applications/fedora-design-team.desktop << FOE
+[Desktop Entry]
+Name=About Design Suite
+GenericName=About Design Suite Wiki Page
+Comment=Wiki page of Design Team
+Exec=xdg-open http://fedoraproject.org/wiki/Design
+Type=Application
+Icon=applications-internet
+Categories=Documentation;
+FOE
+chmod a+x /usr/share/applications/fedora-design-team.desktop
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-#EOF
-
 %end
 

fedora-live-kde-base.ks

@@ -42,12 +42,12 @@ chown liveuser:liveuser /home/liveuser/.xsession
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=kde-plasma.desktop
+Session=plasma.desktop
 SDDM_EOF
 fi
 

fedora-livecd-mate_compiz.ks

@@ -17,12 +17,17 @@ mate-netspeed
 system-config-printer
 system-config-printer-applet
 
-
 # audio player
 audacious
 
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
 # First, no office
--planner
+#-planner
 
 # Drop things for size
 -@3d-printing
@@ -39,43 +44,21 @@ audacious
 -gnome-icon-theme-symbolic
 -gnome-software
 -gnome-themes
+-gnome-themes-standard
 -gnome-user-docs
--gstreamer1-plugins-good
+
--gstreamer1-plugins-bad-free
--gstreamer-plugins-good
--gstreamer-plugins-bad-free
--gstreamer-plugins-espeak
--@guest-desktop-agents
--@libreoffice
 -@mate-applications
 -mate-icon-theme-faenza
 -NetworkManager-bluetooth
--samba-client
--ibus-chewing
--libical
--OpenEXR-libs
 
 # Drop oversized fonts that aren't needed
--gnu-free-mono-fonts
--gnu-free-fonts-common
--gnu-free-serif-fonts
--gnu-free-sans-fonts
--stix-fonts
-
-# Drop the Java plugin
--icedtea-web
--java-1.8.0-openjdk
 
 # Drop things that pull in perl
--linux-atm
 
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
 # strong preference to giving it a go on #fedora-desktop.
 # also see http://bugzilla.gnome.org/681084
--aspell-*
--man-pages*
--words
 
 # Help and art can be big, too
 -gnome-user-docs
@@ -84,24 +67,6 @@ audacious
 -*backgrounds-extras
 
 # Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
-
--minicom
-
--jwhois
--mtr
--pinfo
--rsh
--ypbind
--yp-tools
--ntsysv
-
-# Drop some system-config things
--system-config-rootpassword
--system-config-services
--policycoreutils-gui
 
 %end
 

fedora-livecd-security.ks

@@ -75,7 +75,6 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
--picviz-gui
 -proxychains
 -pyrit
 -raddump
@@ -88,9 +87,7 @@ gnome-keyring-pam
 -tcpreplay
 -tripwire
 -wipe
-
+-zmap
-# Is not available for OpenVAS-7. No longer supported by upstream.
--openvas-client 
 
 %end
 

fedora-livedvd-games.ks

@@ -33,7 +33,7 @@ asc
 asc-music
 astromenace
 beneath-a-steel-sky-cd
-boswars
+#boswars # currently not building
 btanks
 bzflag
 crossfire-client

fedora-livedvd-scientific_kde.ks

@@ -171,6 +171,10 @@ hevea
 #Include Mozilla Firefox
 firefox
 
+# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
+-kde-l10n-*
+-calligra-l10n-*
+
 %end
 
 %post

fedora-repo-not-rawhide.ks

@@ -1,3 +1,3 @@
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch

fedora-repo-rawhide.ks

@@ -1 +1 @@
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch

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

fedora-xfce-packages.ks

@@ -24,6 +24,8 @@ gnome-keyring-pam
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras
+wget
+system-config-printer
 
 # save some space
 -autofs