cloud-base: Document how to use ImageFactory locally

it is not included in f22 and will need ot be re reviewed and sumbitted
if interested parties step up and want to actively maintain and test

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

atomic-installer/lorax-configure-repo.tmpl

@@ -0,0 +1,8 @@
+## Lorax template to configure Anaconda to use the local OSTree
+## repository on disk.
+
+<%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\n%end\n"
+

atomic-installer/lorax-embed-repo.tmpl

@@ -0,0 +1,11 @@
+## Lorax template to embed an OSTree repository into the installer.iso
+## and configure an interactive installer use to look for it.
+##
+## Note that we pull with depth=0 to only get *one* commit into the
+## ISO, because we obviously don't want the full history.
+
+<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
+runcmd mkdir -p ${workdir}/iso-graft/content/repo
+runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
+runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
+runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}

fedora-arm-base.ks

@@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=512 --fstype ext3
+part /boot --size=300 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 

fedora-arm-minimal.ks

@@ -1,7 +1,7 @@
 %include fedora-arm-base.ks
 
-part swap --size=128 --fstype swap
-part / --size=1400 --fstype ext4
+part swap --size=256 --fstype swap
+part / --size=1200 --fstype ext4
 
 %packages
 -@standard

fedora-arm-server.ks

@@ -1,5 +1,8 @@
 %include fedora-arm-base.ks
 
+# server defaults to xfs for / so lets do so on arm also
+part / --size=3000 --fstype xfs
+
 %packages
 -@fedora-release-nonproduct
 -@dial-up

fedora-arm-xfce.ks

@@ -2,6 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.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

fedora-cloud-atomic-vagrant.ks

@@ -11,7 +11,7 @@ user --name=vagrant --password=vagrant
 
 # Work around cloud-init being both disabled and enabled; need
 # to refactor to a common base.
-rm /etc/systemd/system/multi-user.target.wants/cloud-init* /etc/systemd/system/multi-user.target.wants/cloud-config*
+systemctl mask cloud-init cloud-init-local cloud-config cloud-final
 
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers

fedora-cloud-atomic.ks

@@ -1,8 +1,10 @@
-# 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.
+# Fedora Atomic is a cloud-focused spin implementing the Project
+# Atomic patterns.  Note that this replicates the same tree which can
+# now be installed on bare metal.
+
+# This image allocates most space to an LVM-managed thin pool
+# dedicated for Docker containers, and uses docker-storage-setup to
+# dynamically resize storage on boot.
 
 text
 lang en_US.UTF-8
@@ -19,7 +21,8 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,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

fedora-cloud-base-vagrant.ks

@@ -0,0 +1,57 @@
+# Like the Cloud Base image, but tuned for vagrant.  Enable
+# the vagrant user, disable cloud-init.
+
+%include fedora-cloud-base.ks
+
+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
+
+# So, to be clear, this gaping security hole is an integral part of how
+# Vagrant works - These images are _not_ supposed to be run in any public-
+# Internet facing way - They are for use on developer setups, almost always
+# with NAT
+user --name=vagrant --password=vagrant
+
+# Suggestion from @purpleidea that most/many vagrant boxes also set root PW
+# to "vagrant" for ease of use.  Again, see comments above.
+rootpw vagrant
+
+# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
+# even on VirtualBox virt, we get a primary network device with "eth0" as the name
+# This simplifies things and allows a single disk image for both supported Vagrant
+# platforms (virtualbox and kvm)
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
+
+%packages
+# The default koji Vagrantfile configuration uses rsync to sync files between
+# the vagrant host and the guest.  It uses yum to verify that rsync is present
+# and/or install it if it is not.  It will fail without adding the yum compat
+# layer for dnf
+# TODO: Teach vagrant about dnf
+dnf-yum
+%end
+
+%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/
+
+# Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
+mkdir -m 0700 -p /root/.ssh
+cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
+chmod 600 /root/.ssh/authorized_keys
+chown -R root:root /root/.ssh
+
+%end
+

fedora-cloud-base.ks

@@ -7,9 +7,22 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with appliance-creator and
-# 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.
+# This kickstart file is designed to be used with ImageFactory (in Koji).
+#
+# To do a local build, you'll need to install ImageFactory.  See
+# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
+#
+# For a TDL file, I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+# (Koji generates one internally...what we really want is Koji to publish it statically)
+# 
+# Once you have imagefactory and imagefactory-plugins installed, run:
+# 
+#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
+#   tempfile=$(mktemp --suffix=.ks)
+#   ksflatten -v F22 fedora-cloud-base.ks > ${tempfile}
+#   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
+#
 
 cmdline
 lang en_US.UTF-8
@@ -142,9 +155,11 @@ NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.
+# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
 cat > /etc/sysconfig/network << EOF
 NETWORKING=yes
 NOZEROCONF=yes
+DEVTIMEOUT=10
 EOF
 
 # For cloud images, 'eth0' _is_ the predictable device name, since

fedora-docker-base.ks

@@ -2,6 +2,18 @@
 #
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
+#
+###  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+# 
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+# 
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
+#
 
 cmdline
 bootloader --location=none
@@ -9,7 +21,6 @@ timezone --isUtc --nontp Etc/UTC
 rootpw --plaintext qweqwe
 
 keyboard us
-firewall --disable
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
@@ -21,7 +32,8 @@ bash
 fedora-release
 rootfiles
 vim-minimal
-yum
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
@@ -60,6 +72,5 @@ sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 
 rm -f /etc/machine-id
-rm -f /etc/fstab
 
 %end

fedora-install-server.ks

@@ -81,6 +81,7 @@ dracut-*
 @headless-management
 @container-management
 @domain-client
+@server-hardware-support
 
 # Common server packages
 @mysql

fedora-live-base.ks

@@ -305,6 +305,9 @@ if [ -x /usr/bin/fc-cache ] ; then
    fc-cache -f
 fi
 
+echo 'File created by kickstart. See systemd-update-done.service(8).' \
+    | tee /etc/.updated >/var/.updated
+
 %end
 
 

fedora-live-design_suite.ks

@@ -13,14 +13,11 @@
 part / --size 8192
 
 %packages
-
 # graphics
 blender
 LuxRender-blender
 YafaRay-blender
 bluefish 
-#cinepaint
-#cmyktool
 colord-extra-profiles
 darktable
 dia
@@ -110,9 +107,9 @@ 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
+Name=Design Suite Info
+GenericName=About Design Suite
+Comment=Wiki page of Design Suite
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
@@ -123,8 +120,8 @@ 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
+Name=Design Team Info
+GenericName=About Design Team 
 Comment=Wiki page of Design Team
 Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application

fedora-live-jam_kde.ks

@@ -199,12 +199,12 @@ thunderbird
 %post
 
 #setup kickoff favorites
-/bin/mkdir -p /etc/skel/.kde/share/config
+/bin/mkdir -p /etc/skel/.config
 
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
+cat <<EOF  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF

fedora-live-kde-base.ks

@@ -13,16 +13,16 @@ DESKTOP="KDE"
 DISPLAYMANAGER="KDE"
 EOF
 
-# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="oxygen-gtk"
+gtk-theme-name="Adwaita"
 EOF
 mkdir -p /root/.config/gtk-3.0
 cat > /root/.config/gtk-3.0/settings.ini << EOF
 [Settings]
-gtk-theme-name = oxygen-gtk
+gtk-theme-name = Adwaita
 EOF
 
 # add initscript
@@ -52,10 +52,10 @@ SDDM_EOF
 fi
 
 # add liveinst.desktop to favorites menu
-mkdir -p /home/liveuser/.kde/share/config/
-cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.config/
+cat > /home/liveuser/.config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
@@ -107,15 +107,6 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
-# Disable nepomuk
-cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
-[Basic Settings]
-Start Nepomuk=false
-
-[Service-nepomukfileindexer]
-autostart=false
-NEPOMUK_EOF
-
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/

fedora-live-mate_compiz.ks

@@ -5,7 +5,7 @@
 %include fedora-live-base.ks
 %include fedora-mate-packages.ks
 
-part / --size 4096 
+part / --size 6144 
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

fedora-livecd-mate_compiz.ks

@@ -12,6 +12,12 @@
 caja-actions
 mate-disk-usage-analyzer
 mate-netspeed
+mate-themes-extras
+
+# more backgrounds
+f22-backgrounds-mate
+f21-backgrounds-extras-base
+f21-backgrounds-extras-mate
 
 # system tools
 system-config-printer
@@ -26,17 +32,12 @@ audacious
 # dsl tools
 rp-pppoe
 
-# First, no office
-#-planner
-
 # Drop things for size
 -@3d-printing
 -brasero
 -bluez
 -bluez-cups
 -colord
--@dial-up
--espeak
 -fedora-icon-theme
 -GConf2
 -gnome-bluetooth-libs
@@ -63,10 +64,9 @@ rp-pppoe
 # Help and art can be big, too
 -gnome-user-docs
 -evolution-help
--desktop-backgrounds-basic
--*backgrounds-extras
 
 # Legacy cmdline things we don't want
+-telnet
 
 %end
 

fedora-livedvd-electronic_lab.ks

@@ -1,59 +0,0 @@
-# Description : Live DVD image for Fedora/Free Electronic Lab
-#
-# Maintainer(s):
-# - Chitlesh Goorah <chitlesh a fedoraproject.org>
-# - Thibault North  <tnorth   a fedoraproject.org>
-
-%include fedora-live-workstation.ks
-
-# DVD payload
-part / --size 10240
-
-%packages
-
-@electronic-lab
-
-# Support for the Milkymist hardware community
-@milkymist
-
-
-# Office
-dia
-vym
-libreoffice-writer
-libreoffice-calc
-libreoffice-impress
-#libreoffice-extendedPDF
-planner
-graphviz
-
-
-# debugging tools
-make
-gdb
-valgrind
-kdbg
-wireshark-gnome
-qemu
-
-
-# EDA/CAD department
-perl-Test-Pod
-perl-Test-Pod-Coverage
-
-
-# Removing unnecessary packages from the desktop spin
--abiword
--@games
--gimp
--gimp-libs
--gimp-data-extras
--kdebluetooth
--kbluetooth
--rdesktop
-
-%end
-
-%post
-
-%end

fedora-livedvd-games.ks

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